fix disabled elements in headmenu

evolution-cms · Feb 21, 2021 · 8da8d75 · 8da8d75
1 parent 37e9365
commit 8da8d75
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/manager/media/style/default/ajax.php b/manager/media/style/default/ajax.php
@@ -141,7 +141,7 @@
                     case 'element_tplvars':
                         $a = 301;
                         $prefix = \DB::getTablePrefix();
-                        $sql = \EvolutionCMS\Models\SiteTmplvar::query()->select('site_tmplvars.id', 'site_tmplvars.name', 'site_tmplvars.locked', 'site_tmplvar_templates.tmplvarid', \DB::raw('IFNULL(templateid, roleid) AS `disabled`'))
+                        $sql = \EvolutionCMS\Models\SiteTmplvar::query()->select('site_tmplvars.id', 'site_tmplvars.name', 'site_tmplvars.locked', 'site_tmplvar_templates.tmplvarid', 'templateid', 'roleid')
                             ->leftJoin('site_tmplvar_templates', function ($join) {
                                 $join->on('site_tmplvar_templates.tmplvarid', '=', 'site_tmplvars.id');
                                 $join->on('site_tmplvar_templates.templateid', '>', \DB::raw(0));
@@ -213,10 +213,8 @@
 
                     foreach ($sql->take($limit)->get() as $row) {
                         $row = $row->toArray();
-                        if ($a == 301 && !is_numeric($row['disabled'])) {
-                            $row['disabled'] = 1;
-                        } else {
-                            $row['disabled'] = 0;
+                        if ($a == 301) {
+                            $row['disabled'] = !$row['templateid'] && !$row['roleid'];
                         }
                         if (!isset($row['disabled'])) $row['disabled'] = 0;
                         if (($row['disabled'] || $row['locked']) && $role != 1) {