Powerful and easy to use cms to build websites, blogs or ecommerce stores.
HTML backendblogblog-engineblog-platformbloggingcmscontent-managementcontent-management-systemecommerceecommerce-platformno-codepage-builderphpphp-cmsphp7php8self-hostedshopping-cartweb-applicationwebsite-builder
Menu to site list on menu edit page
givanzdfbe6360df1d
diff --git a/admin/controller/content/menus.php b/admin/controller/content/menus.phpindex 820beb4..0db79db 100755--- a/admin/controller/content/menus.php+++ b/admin/controller/content/menus.php@@ -28,6 +28,8 @@ use Vvveb\Sql\menuSQL;use Vvveb\System\Sites;class Menus extends Categories {+ use SitesTrait;+function deleteMenu() {$view = $this->view;$menu_id = $this->request->post['menu_id'] ?? $this->request->get['menu_id'] ?? false;@@ -157,6 +159,7 @@ class Menus extends Categories {function menu() {$menuId = $this->request->get['menu_id'] ?? false;$menu_data = $this->request->post['menu_data'] ?? false;+ $site_id = $this->request->post['site'] ?? []; //[$this->global['site_id']];$view = $this->view;$menus = new menuSQL();@@ -186,11 +189,13 @@ class Menus extends Categories {}if ($menu_data) {- $menu_data = $menu_data + $options;+ $menu_data = $menu_data + ['site_id' => $site_id] + $options;+$return = $menus->editMenu($menu_data);$id = $return['menu'];+ $menu_site = $return['menu_to_site'];- if (! $id) {+ if (! $id && ! $menu_site) {$view->errors = ['No changes!'];} else {$view->success[] = __('Menu saved!');@@ -201,7 +206,7 @@ class Menus extends Categories {} else {if ($menu_data) {$menu_data = $menu_data + $this->global;- $return = $menus->addMenu(['menu' => $menu_data]);+ $return = $menus->addMenu(['menu' => $menu_data, 'site_id' => $site_id]);$id = $return['menu'];@@ -219,7 +224,18 @@ class Menus extends Categories {}$view->set($results);+ $view->menu_id = $menuId;+ $sites = $results['menu_data']['menu_to_site'] ?? [];++ if ($sites) {+ $sites = array_keys($sites);+ } else {+ if (! $menuId) {+ $sites[] = $this->global['site_id'];+ }+ }+ $view->sitesList = $this->sites($sites);$admin_path = \Vvveb\adminPath();$controllerPath = $admin_path . 'index.php?module=media/media';$view->scanUrl = "$controllerPath&action=scan";diff --git a/admin/controller/content/sites-trait.php b/admin/controller/content/sites-trait.phpnew file mode 100644index 0000000..a8b2815--- /dev/null+++ b/admin/controller/content/sites-trait.php@@ -0,0 +1,55 @@+<?php++/**+ * Vvveb+ *+ * Copyright (C) 2022 Ziadin Givan+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as+ * published by the Free Software Foundation, either version 3 of the+ * License, or (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <https://www.gnu.org/licenses/>.+ *+ */++namespace Vvveb\Controller\Content;++use Vvveb\Sql\SiteSQL;+use Vvveb\System\User\Admin;++trait SitesTrait {+ function sites($selectedSites = []) {+ $sites = new SiteSQL();++ $options = [];++ if (Admin::hasCapability('edit_other_sites')) {+ //unset($options['site_id']);+ } else {+ $options['site_id'] = Admin :: siteAccess();+ }++ $results = $sites->getAll(+ $options + [+ 'start' => 0,+ 'limit' => 100,+ ]+ )['site'] ?? [];++ if ($results && $selectedSites) {+ foreach ($results as &$site) {+ $site['selected'] = in_array($site['site_id'], $selectedSites);+ }+ }++ return $results;+ }+}diff --git a/admin/sql/mysqli/menu.sql b/admin/sql/mysqli/menu.sqlindex 13f7d6b..390ddca 100644--- a/admin/sql/mysqli/menu.sql+++ b/admin/sql/mysqli/menu.sql@@ -11,30 +11,47 @@IN slug CHAR,-- return menus count for count query- OUT fetch_row+ OUT fetch_row, --menu+ OUT fetch_all -- menu_to_site)BEGINSELECT *FROM menu AS _++ @IF isset(:site_id)+ THEN+ INNER JOIN menu_to_site ON (_.menu_id = menu_to_site.menu_id)+ END @IFWHERE 1 = 1@IF isset(:slug)THEN- AND slug = :slug+ AND _.slug = :slugEND @IF@IF isset(:menu_id)THEN- AND menu_id = :menu_id+ AND _.menu_id = :menu_id++ END @IF++ @IF isset(:site_id)+ THEN++ AND menu_to_site.site_id = :site_idEND @IFLIMIT 1;++ -- menu_to_site+ SELECT site_id as array_key, site_id FROM menu_to_site+ WHERE menu_to_site.menu_id = :menu_id;END@@ -46,7 +63,7 @@-- variablesIN language_id INT,IN menu_id INT,- IN site_id INT,+ IN site_id ARRAY,IN slug CHAR,IN name CHAR,@@ -57,6 +74,18 @@UPDATE menu SET slug = :slug, name = :name WHERE menu_id = :menu_id;+ @IF isset(:site_id)+ THEN+ DELETE FROM menu_to_site WHERE menu_id = :menu_id+ END @IF;++ @EACH(:site_id)+ INSERT INTO menu_to_site++ ( menu_id, site_id )++ VALUES ( :menu_id, :each );+END -- edit menu-- add menu@@ -66,7 +95,7 @@-- variablesIN language_id INT,IN menu_id INT,- IN site_id INT,+ IN site_id ARRAY,IN menu ARRAY,-- return menus count for count query@@ -81,6 +110,13 @@VALUES ( :menu );+ @EACH(:site_id)+ INSERT INTO menu_to_site++ ( menu_id, site_id )++ VALUES ( @result.menu, :each );+END-- delete menu@@ -130,9 +166,23 @@FROM menu+ @IF isset(:site_id)+ THEN+ INNER JOIN menu_to_site ON (menu.menu_id = menu_to_site.menu_id)+ END @IF++ WHERE 1 = 1+@IF isset(:menu_id)THEN- WHERE menu.menu_id IN (:menu_id)+ AND menu.menu_id IN (:menu_id)+ END @IF++ @IF isset(:site_id)+ THEN++ AND menu_to_site.site_id = :site_id+END @IF-- limit@@ -264,8 +314,8 @@AND categories.menu_id = :menu_id- END @IF-+ END @IF+ORDER BY categories.parent_id, categories.sort_order, categories.menu_item_id@IF isset(:limit)diff --git a/admin/sql/pgsql/menu.sql b/admin/sql/pgsql/menu.sqlindex 55d1807..960e2ec 100755--- a/admin/sql/pgsql/menu.sql+++ b/admin/sql/pgsql/menu.sql@@ -11,30 +11,47 @@IN slug CHAR,-- return menus count for count query- OUT fetch_row+ OUT fetch_row, --menu+ OUT fetch_all -- menu_to_site)BEGINSELECT *FROM menu AS _++ @IF isset(:site_id)+ THEN+ INNER JOIN menu_to_site ON (_.menu_id = menu_to_site.menu_id)+ END @IFWHERE 1 = 1@IF isset(:slug)THEN- AND slug = :slug+ AND _.slug = :slugEND @IF@IF isset(:menu_id)THEN- AND menu_id = :menu_id+ AND _.menu_id = :menu_id++ END @IF++ @IF isset(:site_id)+ THEN++ AND menu_to_site.site_id = :site_idEND @IFLIMIT 1;++ -- menu_to_site+ SELECT site_id as array_key, site_id FROM menu_to_site+ WHERE menu_to_site.menu_id = :menu_id;END@@ -46,7 +63,7 @@-- variablesIN language_id INT,IN menu_id INT,- IN site_id INT,+ IN site_id ARRAY,IN slug CHAR,IN name CHAR,@@ -57,6 +74,18 @@UPDATE menu SET slug = :slug, name = :name WHERE menu_id = :menu_id;+ @IF isset(:site_id)+ THEN+ DELETE FROM menu_to_site WHERE menu_id = :menu_id+ END @IF;++ @EACH(:site_id)+ INSERT INTO menu_to_site++ ( menu_id, site_id )++ VALUES ( :menu_id, :each );+END -- edit menu-- add menu@@ -66,7 +95,7 @@-- variablesIN language_id INT,IN menu_id INT,- IN site_id INT,+ IN site_id ARRAY,IN menu ARRAY,-- return menus count for count query@@ -80,6 +109,13 @@( @KEYS(:menu) )VALUES ( :menu ) RETURNING menu_id;++ @EACH(:site_id)+ INSERT INTO menu_to_site++ ( menu_id, site_id )++ VALUES ( @result.menu, :each );END@@ -130,9 +166,23 @@FROM menu+ @IF isset(:site_id)+ THEN+ INNER JOIN menu_to_site ON (menu.menu_id = menu_to_site.menu_id)+ END @IF++ WHERE 1 = 1+@IF isset(:menu_id)THEN- WHERE menu.menu_id IN (:menu_id)+ AND menu.menu_id IN (:menu_id)+ END @IF++ @IF isset(:site_id)+ THEN++ AND menu_to_site.site_id = :site_id+END @IF-- limitdiff --git a/admin/sql/sqlite/menu.sql b/admin/sql/sqlite/menu.sqlindex 4c6b57f..9b7d815 100755--- a/admin/sql/sqlite/menu.sql+++ b/admin/sql/sqlite/menu.sql@@ -11,30 +11,47 @@IN slug CHAR,-- return menus count for count query- OUT fetch_row+ OUT fetch_row, --menu+ OUT fetch_all -- menu_to_site)BEGINSELECT *FROM menu AS _++ @IF isset(:site_id)+ THEN+ INNER JOIN menu_to_site ON (_.menu_id = menu_to_site.menu_id)+ END @IFWHERE 1 = 1@IF isset(:slug)THEN- AND slug = :slug+ AND _.slug = :slugEND @IF@IF isset(:menu_id)THEN- AND menu_id = :menu_id+ AND _.menu_id = :menu_id++ END @IF++ @IF isset(:site_id)+ THEN++ AND menu_to_site.site_id = :site_idEND @IFLIMIT 1;++ -- menu_to_site+ SELECT site_id as array_key, site_id FROM menu_to_site+ WHERE menu_to_site.menu_id = :menu_id;END@@ -46,7 +63,7 @@-- variablesIN language_id INT,IN menu_id INT,- IN site_id INT,+ IN site_id ARRAY,IN slug CHAR,IN name CHAR,@@ -57,6 +74,18 @@UPDATE menu SET slug = :slug, name = :name WHERE menu_id = :menu_id;+ @IF isset(:site_id)+ THEN+ DELETE FROM menu_to_site WHERE menu_id = :menu_id+ END @IF;++ @EACH(:site_id)+ INSERT INTO menu_to_site++ ( menu_id, site_id )++ VALUES ( :menu_id, :each );+END -- edit menu-- add menu@@ -66,7 +95,7 @@-- variablesIN language_id INT,IN menu_id INT,- IN site_id INT,+ IN site_id ARRAY,IN menu ARRAY,-- return menus count for count query@@ -81,6 +110,13 @@VALUES ( :menu );+ @EACH(:site_id)+ INSERT INTO menu_to_site++ ( menu_id, site_id )++ VALUES ( @result.menu, :each );+END-- delete menu@@ -130,9 +166,23 @@FROM menu+ @IF isset(:site_id)+ THEN+ INNER JOIN menu_to_site ON (menu.menu_id = menu_to_site.menu_id)+ END @IF++ WHERE 1 = 1+@IF isset(:menu_id)THEN- WHERE menu.menu_id IN (:menu_id)+ AND menu.menu_id IN (:menu_id)+ END @IF++ @IF isset(:site_id)+ THEN++ AND menu_to_site.site_id = :site_id+END @IF-- limitdiff --git a/admin/template/content/menus/menu.tpl b/admin/template/content/menus/menu.tplindex f9a9120..0d8b81a 100755--- a/admin/template/content/menus/menu.tpl+++ b/admin/template/content/menus/menu.tpl@@ -108,3 +108,6 @@ foreach ($languages as $key => $language) {$_i++;}?>+++import(content/sites.tpl)diff --git a/admin/template/content/sites.tpl b/admin/template/content/sites.tplnew file mode 100644index 0000000..6a71759--- /dev/null+++ b/admin/template/content/sites.tpl@@ -0,0 +1,16 @@+@site = [data-v-sites] [data-v-site]+@site|deleteAllButFirstChild++@site|before = <?php+if(isset($this->sitesList) && is_array($this->sitesList)) {+ foreach ($this->sitesList as $index => $site) {?>++ @site [data-v-site-*]|innerText = $site['@@__data-v-site-(*)__@@']+ @site [data-v-site-*]|title = $site['@@__data-v-site-(*)__@@']+ @site input[data-v-site-*]|addNewAttribute = <?php if (isset($site['selected']) && $site['selected']) echo 'checked';?>+++ @site|after = <?php+ }+}?>+