Rename legacy admin siteaccess

emodric · Jan 3, 2018 · 321280f · 321280f
1 parent 8db9030
commit 321280f
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 9 deletions.
diff --git a/app/config/ezplatform.yml b/app/config/ezplatform.yml
@@ -13,14 +13,14 @@ ezpublish:
 
     # Siteaccess configuration, with one siteaccess per default
     siteaccess:
-        list: [site, admin]
+        list: [site, admin, legacy_admin]
         groups:
             site_group: [site]
 
             # WARNING: Do not remove or rename this group.
             # It's used to distinguish common siteaccesses from admin ones.
             # In case of multisite with multiple admin panels, remember to add any additional admin siteaccess to this group.
-            admin_group: [admin]
+            admin_group: [admin, legacy_admin]
         default_siteaccess: site
         match:
             URIElement: 1
@@ -58,5 +58,5 @@ ezpublish:
 
 ez_publish_legacy:
     system:
-        admin:
+        legacy_admin:
            legacy_mode: true
diff --git a/ezpublish_legacy/config.php b/ezpublish_legacy/config.php
diff --git a/ezpublish_legacy/settings/override/site.ini.append.php b/ezpublish_legacy/settings/override/site.ini.append.php
@@ -16,7 +16,7 @@
 DefaultAccess=site
 SiteList[]
 SiteList[]=site
-SiteList[]=admin
+SiteList[]=legacy_admin
 RootNodeDepth=1
 
 [UserSettings]
@@ -26,7 +26,7 @@
 CheckValidity=false
 AvailableSiteAccessList[]
 AvailableSiteAccessList[]=site
-AvailableSiteAccessList[]=admin
+AvailableSiteAccessList[]=legacy_admin
 MatchOrder=uri
 HostMatchMapItems[]
 

diff --git a/...s/siteaccess/admin/content.ini.append.php → ...ccess/legacy_admin/content.ini.append.php b/...s/siteaccess/admin/content.ini.append.php → ...ccess/legacy_admin/content.ini.append.php
diff --git a/...admin/contentstructuremenu.ini.append.php → ...admin/contentstructuremenu.ini.append.php b/...admin/contentstructuremenu.ini.append.php → ...admin/contentstructuremenu.ini.append.php
diff --git a/...siteaccess/admin/dashboard.ini.append.php → ...ess/legacy_admin/dashboard.ini.append.php b/...siteaccess/admin/dashboard.ini.append.php → ...ess/legacy_admin/dashboard.ini.append.php
diff --git a/...ings/siteaccess/admin/ezoe.ini.append.php → ...teaccess/legacy_admin/ezoe.ini.append.php b/...ings/siteaccess/admin/ezoe.ini.append.php → ...teaccess/legacy_admin/ezoe.ini.append.php
diff --git a/...ngs/siteaccess/admin/ezxml.ini.append.php → ...eaccess/legacy_admin/ezxml.ini.append.php b/...ngs/siteaccess/admin/ezxml.ini.append.php → ...eaccess/legacy_admin/ezxml.ini.append.php
diff --git a/...ings/siteaccess/admin/icon.ini.append.php → ...teaccess/legacy_admin/icon.ini.append.php b/...ings/siteaccess/admin/icon.ini.append.php → ...teaccess/legacy_admin/icon.ini.append.php
diff --git a/...ngs/siteaccess/admin/image.ini.append.php → ...eaccess/legacy_admin/image.ini.append.php b/...ngs/siteaccess/admin/image.ini.append.php → ...eaccess/legacy_admin/image.ini.append.php
diff --git a/.../siteaccess/admin/override.ini.append.php → ...cess/legacy_admin/override.ini.append.php b/.../siteaccess/admin/override.ini.append.php → ...cess/legacy_admin/override.ini.append.php
diff --git a/...ings/siteaccess/admin/site.ini.append.php → ...teaccess/legacy_admin/site.ini.append.php b/...ings/siteaccess/admin/site.ini.append.php → ...teaccess/legacy_admin/site.ini.append.php
@@ -8,7 +8,7 @@
 RequireUserLogin=true
 RelatedSiteAccessList[]
 RelatedSiteAccessList[]=site
-RelatedSiteAccessList[]=admin
+RelatedSiteAccessList[]=legacy_admin
 ShowHiddenNodes=true
 
 [DesignSettings]

diff --git a/...s/siteaccess/admin/toolbar.ini.append.php → ...ccess/legacy_admin/toolbar.ini.append.php b/...s/siteaccess/admin/toolbar.ini.append.php → ...ccess/legacy_admin/toolbar.ini.append.php