hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-02-10 07:16:06 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1274 from openclassify/dia

Browse Source 
#5159 openclassify new setup
This commit is contained in:
Muammer Top 2022-01-20 16:33:15 +03:00 committed by GitHub
commit ed55fde460
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig
View File

@ -1,6 +1,5 @@
<!-- Meta Tags --> <!-- Meta Tags -->
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="generator" content="{{ config_get('streams::distribution.name') }}"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, viewport-fit=cover"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, viewport-fit=cover">
<meta name="description" <meta name="description"
content="{{ (template.get('meta_description') ?: setting_value('streams::description'))|slice(0,160) }}"/> content="{{ (template.get('meta_description') ?: setting_value('streams::description'))|slice(0,160) }}"/>

9
addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
View File

@ -129,18 +129,21 @@ class CategoryController extends AdminController
$this->createIconFile($category->getId()); $this->createIconFile($category->getId());
$this->dispatch(new CalculateCategoryLevel($category->getId())); $this->dispatch(new CalculateCategoryLevel($category->getId()));
} } else {
$this->messages->error(trans('visiosoft.module.cats::message.cat_slug_exists', [ $this->messages->error(trans('visiosoft.module.cats::message.cat_slug_exists', [
'slug' => $slug 'slug' => $slug
])); ]));
}
} else { } else {
for ($i = 0; $i < count($isMultiCat[0]); $i++) { for ($i = 0; $i < count($isMultiCat[0]); $i++) {
foreach ($isMultiCat as $cat) { foreach ($isMultiCat as $cat) {
$translatableEntries = array_merge($translatableEntries, $cat[$i]); $translatableEntries = array_merge($translatableEntries, $cat[$i]);
} }
$slug = $this->str->slug(reset($translatableEntries)['name'], '_'); $slug = $this->str->slug(
collect($translatableEntries)->where('name', '!=', '')->first()['name'],
'_'
);
if ($this->categoryRepository->findBySlug($slug)) { if ($this->categoryRepository->findBySlug($slug)) {
$this->messages->error(trans('visiosoft.module.cats::message.cat_slug_exists', [ $this->messages->error(trans('visiosoft.module.cats::message.cat_slug_exists', [
'slug' => $slug 'slug' => $slug