Author: Jonathan.Wage
Date: 2010-02-01 02:44:22 +0100 (Mon, 01 Feb 2010)
New Revision: 27372
Removed:
plugins/sfSympalPlugin/trunk/web/images/dashboard_icon.gif
Modified:
plugins/sfSympalPlugin/trunk/data/fixtures/install.yml
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/menu/sfSympalMenuAdminMenu.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenu.class.php
Log:
[1.4][sfSympalPlugin][1.0] More fixes for credentials
Modified: plugins/sfSympalPlugin/trunk/data/fixtures/install.yml
===================================================================
--- plugins/sfSympalPlugin/trunk/data/fixtures/install.yml 2010-02-01
00:59:59 UTC (rev 27371)
+++ plugins/sfSympalPlugin/trunk/data/fixtures/install.yml 2010-02-01
01:44:22 UTC (rev 27372)
@@ -44,69 +44,91 @@
<?php echo sfSympalConfig::get('group_model') ?>:
AdministratorGroup:
name: Administrator
- Permissions: [ViewDashboard, ManageSystemSettings, ManageContentSetup,
ManageSites, ManageContent, ManagePlugins, ManageMenus, ManageUsers,
ManageGroups, ManagePermissions]
- RegisteredGroup:
- name: Registered
- GuestGroup:
- name: Guest
+ description: Administrator group has access to all permissions but is not
a super admin.
+ Permissions: [CreateAssetDirectories, UploadAssets, Developer, ClearCache,
ViewDashboard, ViewAdminBar, ViewServerCheck, UpdateManager, PublishContent,
ManageSlots, ManageRedirects, InsertAssets, InsertLinks, ManageAssets,
InlineEditing, ManageContentTypes, ManageSites, ManageContent, ManagePlugins,
ManageMenus, ManageUsers, ManageGroups, ManagePermissions, ManageSites,
ManageThemes, ManageSystemSettings]
ContentEditorGroup:
name: ContentEditor
- Permissions: [ViewDashboard, ManageContent]
+ Permissions: [CreateAssetDirectories, UploadAssets, ViewAdminBar,
ViewDashboard, ManageContent, ManageSlots, PublishContent, InsertAssets,
InsertLinks, ManageAssets, InlineEditing, ManageMenus]
SecurityManagerGroup:
name: SecurityManager
Permissions: [ViewDashboard, ManageUsers, ManageGroups, ManagePermissions]
DeveloperGroup:
name: Developer
- Permissions: [ViewDashboard, ManageSystemSettings, ManageContentSetup,
ManageSites, ManageContent, ManagePlugins, ManageMenus, ManageUsers,
ManageGroups, ManagePermissions, Developer]
+ Permissions: [ViewDashboard, ManageSystemSettings, ManageContentTypes,
ManageSites, ManageContent, ManagePlugins, ManageMenus, ManageUsers,
ManageGroups, ManagePermissions, Developer]
<?php echo sfSympalConfig::get('permission_model') ?>:
CreateAssetDirectories:
name: CreateAssetDirectories
+ description: Access to create directories in the Asset manager.
UploadAssets:
name: UploadAssets
+ description: Access to upload new assets in the Asset manager.
Developer:
name: Developer
+ description: Access to functionality only for developers.
ClearCache:
name: ClearCache
+ description: Access to clear all the cache.
ViewDashboard:
name: ViewDashboard
+ description: Access to view the admin dashboard.
ViewAdminBar:
name: ViewAdminBar
+ description: Access to view the top admin bar.
ViewServerCheck:
name: ViewServerCheck
+ description: Access to view the server check information from the web.
UpdateManager:
name: UpdateManager
+ description: Access to update manager.
ManageContent:
name: ManageContent
+ description: Access to manage content.
PublishContent:
name: PublishContent
+ description: Access to publish and un-publish content.
ManageSlots:
name: ManageSlots
+ description: Access to manage content slots.
ManageRedirects:
name: ManageRedirects
+ description: Access to manage 404 Redirects.
InsertAssets:
name: InsertAssets
+ description: Access to insert assets when editing content.
InsertLinks:
name: InsertLinks
+ description: Access to insert links when editing content.
ManageAssets:
name: ManageAssets
+ description: Access to the assets manager.
InlineEditing:
name: InlineEditing
+ description: Access to inline editing.
ManagePlugins:
name: ManagePlugins
+ description: Access to the plugin manager.
ManageMenus:
name: ManageMenus
+ description: Access to manage menus.
ManageUsers:
name: ManageUsers
+ description: Access to manage users.
ManageGroups:
name: ManageGroups
+ description: Access to manage groups.
ManagePermissions:
name: ManagePermissions
+ description: Access to manage permissions
ManageSites:
name: ManageSites
- ManageContentSetup:
+ description: Access to manage sites.
+ ManageContentTypes:
name: ManageContentTypes
+ description: Access to manage content types.
ManageThemes:
name: ManageThemes
+ description: Access to manage and preview themes.
ManageSystemSettings:
- name: ManageSystemSettings
\ No newline at end of file
+ name: ManageSystemSettings
+ description: Access to change system settings.
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/menu/sfSympalMenuAdminMenu.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/menu/sfSympalMenuAdminMenu.class.php
2010-02-01 00:59:59 UTC (rev 27371)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/lib/menu/sfSympalMenuAdminMenu.class.php
2010-02-01 01:44:22 UTC (rev 27372)
@@ -2,14 +2,4 @@
class sfSympalMenuAdminMenu extends sfSympalMenu
{
- public function renderChildBody()
- {
- if ($this->_route)
- {
- $html = $this->renderLink();
- } else {
- $html = '<div class="clickable">'.$this->renderLabel().'</div>';
- }
- return $html;
- }
}
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenu.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenu.class.php
2010-02-01 00:59:59 UTC (rev 27371)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/menu/sfSympalMenu.class.php
2010-02-01 01:44:22 UTC (rev 27372)
@@ -184,12 +184,23 @@
public function getCredentials()
{
- return $this->_credentials;
+ $credentials = $this->_credentials;
+ foreach ($this->getChildren() as $child)
+ {
+ $credentials = array_merge($credentials, $child->getCredentials());
+ }
+ if ($credentials)
+ {
+ return array($credentials);
+ } else {
+ return array();
+ }
}
public function hasCredentials()
{
- return !empty($this->_credentials);
+ $credentials = $this->getCredentials();
+ return !empty($credentials);
}
public function showChildren($bool = null)
@@ -224,7 +235,7 @@
return false;
}
- return $user->hasCredential($this->_credentials);
+ return $user->hasCredential($this->getCredentials());
}
public function setLevel($level)
@@ -352,7 +363,7 @@
{
if ($child->checkUserAccess())
{
- $children[] = $child;
+ $children[] = true;
}
}
return !empty($children);
Deleted: plugins/sfSympalPlugin/trunk/web/images/dashboard_icon.gif
===================================================================
(Binary files differ)
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
