Author: Jonathan.Wage
Date: 2010-01-31 21:14:14 +0100 (Sun, 31 Jan 2010)
New Revision: 27366
Modified:
plugins/sfSympalPlugin/trunk/data/fixtures/install.yml
plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/config/security.yml
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content_types/config/security.yml
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_dashboard/lib/Basesympal_dashboardActions.class.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/templates/_editor.php
plugins/sfSympalPlugin/trunk/test/fixtures/project/data/fresh_test_db.sqlite
Log:
[1.4][sfSympalPlugin][1.0] Improving and adding permissions
Modified: plugins/sfSympalPlugin/trunk/data/fixtures/install.yml
===================================================================
--- plugins/sfSympalPlugin/trunk/data/fixtures/install.yml 2010-01-31
19:35:41 UTC (rev 27365)
+++ plugins/sfSympalPlugin/trunk/data/fixtures/install.yml 2010-01-31
20:14:14 UTC (rev 27366)
@@ -44,7 +44,7 @@
<?php echo sfSympalConfig::get('group_model') ?>:
AdministratorGroup:
name: Administrator
- Permissions: [ViewDashboard, ManageConfiguration, ManageContentSetup,
ManageSites, ManageContent, ManagePlugins, ManageMenus, ManageUsers,
ManageGroups, ManagePermissions]
+ Permissions: [ViewDashboard, ManageSystemSettings, ManageContentSetup,
ManageSites, ManageContent, ManagePlugins, ManageMenus, ManageUsers,
ManageGroups, ManagePermissions]
RegisteredGroup:
name: Registered
GuestGroup:
@@ -57,13 +57,37 @@
Permissions: [ViewDashboard, ManageUsers, ManageGroups, ManagePermissions]
DeveloperGroup:
name: Developer
- Permissions: [ViewDashboard, ManageConfiguration, ManageContentSetup,
ManageSites, ManageContent, ManagePlugins, ManageMenus, ManageUsers,
ManageGroups, ManagePermissions]
+ Permissions: [ViewDashboard, ManageSystemSettings, ManageContentSetup,
ManageSites, ManageContent, ManagePlugins, ManageMenus, ManageUsers,
ManageGroups, ManagePermissions, Developer]
<?php echo sfSympalConfig::get('permission_model') ?>:
+ Developer:
+ name: Developer
+ ClearCache:
+ name: ClearCache
ViewDashboard:
name: ViewDashboard
+ ViewAdminBar:
+ name: ViewAdminBar
+ ViewServerCheck:
+ name: ViewServerCheck
+ UpdateManager:
+ name: UpdateManager
ManageContent:
name: ManageContent
+ PublishContent:
+ name: PublishContent
+ ManageSlots:
+ name: ManageSlots
+ ManageRedirects:
+ name: ManageRedirects
+ InsertAssets:
+ name: InsertAssets
+ ManageAssets:
+ name: ManageAssets
+ InlineEditing:
+ name: InlineEditing
+ InsertLinks:
+ name: InsertLinks
ManagePlugins:
name: ManagePlugins
ManageMenus:
@@ -77,10 +101,8 @@
ManageSites:
name: ManageSites
ManageContentSetup:
- name: ManageContentSetup
- ManageConfiguration:
- name: ManageConfiguration
- ViewDeveloperInformation:
- name: ViewDeveloperInformation
- ViewAdminBar:
- name: ViewAdminBar
\ No newline at end of file
+ name: ManageContentTypes
+ ManageThemes:
+ name: ManageThemes
+ ManageSystemSettings:
+ name: ManageSystemSettings
\ No newline at end of file
Modified: plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
2010-01-31 19:35:41 UTC (rev 27365)
+++ plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
2010-01-31 20:14:14 UTC (rev 27366)
@@ -47,9 +47,12 @@
$menu->addChild('Go to Site Frontend', '@homepage');
}
- $menu->addChild('My Dashboard', '@sympal_dashboard');
+ if (sfContext::getInstance()->getUser()->hasCredential('ViewDashboard'))
+ {
+ $menu->addChild('My Dashboard', '@sympal_dashboard');
+ }
- if (sfSympalConfig::get('page_cache', 'enabled'))
+ if (sfContext::getInstance()->getUser()->hasCredential('ClearCache'))
{
$menu->addChild('Clear Cache', '@sympal_clear_cache');
}
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-01-31 19:35:41 UTC (rev 27365)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-01-31 20:14:14 UTC (rev 27366)
@@ -13,13 +13,15 @@
public function loadInlineEditBarButtons(sfEvent $event)
{
- $menu = $event->getSubject();
-
- $menu->
- addChild('Dashboard', '@sympal_dashboard')->
- setShortcut('Ctrl+D')->
- setInputClass('toggle_dashboard_menu')
- ;
+ if (sfContext::getInstance()->getUser()->hasCredential('ViewDashboard'))
+ {
+ $menu = $event->getSubject();
+ $menu->
+ addChild('Dashboard', '@sympal_dashboard')->
+ setShortcut('Ctrl+D')->
+ setInputClass('toggle_dashboard_menu')
+ ;
+ }
}
public function addAdminMenu()
@@ -85,7 +87,7 @@
->setCredentials(array('ManageSites'));
$administration->addChild('System Settings', '@sympal_config')
- ->setCredentials(array('ManageConfiguration'));
+ ->setCredentials(array('ManageSystemSettings'));
}
public function loadConfigForm(sfEvent $event)
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/config/security.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/config/security.yml
2010-01-31 19:35:41 UTC (rev 27365)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_config/config/security.yml
2010-01-31 20:14:14 UTC (rev 27366)
@@ -1,3 +1,3 @@
all:
is_secure: on
- credentials: [ManageConfiguration]
\ No newline at end of file
+ credentials: [ManageSystemSettings]
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content_types/config/security.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content_types/config/security.yml
2010-01-31 19:35:41 UTC (rev 27365)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_content_types/config/security.yml
2010-01-31 20:14:14 UTC (rev 27366)
@@ -1,3 +1,3 @@
all:
is_secure: on
- credentials: [ManageContentSetup]
\ No newline at end of file
+ credentials: [ManageContentTypes]
\ No newline at end of file
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_dashboard/lib/Basesympal_dashboardActions.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_dashboard/lib/Basesympal_dashboardActions.class.php
2010-01-31 19:35:41 UTC (rev 27365)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/modules/sympal_dashboard/lib/Basesympal_dashboardActions.class.php
2010-01-31 20:14:14 UTC (rev 27366)
@@ -64,7 +64,7 @@
$this->boxes['Content Types']
->setRoute('@sympal_content_types')
- ->setCredentials(array('ManageContentSetup'));
+ ->setCredentials(array('ManageContentTypes'));
$this->boxes['Users']
->setRoute('@sympal_users')
@@ -80,7 +80,7 @@
$this->boxes['Configuration']
->setRoute('@sympal_config')
- ->setCredentials(array('ManageConfiguration'));
+ ->setCredentials(array('ManageSystemSettings'));
$this->boxes['Sitemap']
->setRoute('@sympal_sitemap')
@@ -88,11 +88,11 @@
$this->boxes['Check for Updates']
->setRoute('@sympal_check_for_updates')
- ->setCredentials(array('ManageSetup'));
+ ->setCredentials(array('UpdateManager'));
$this->boxes['Check Server']
->setRoute('@sympal_check_server')
- ->setCredentials(array('ManageSetup'));
+ ->setCredentials(array('ViewServerCheck'));
$this->getContext()->getEventDispatcher()->notify(new
sfEvent($this->boxes, 'sympal.load_dashboard'));
}
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/templates/_editor.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/templates/_editor.php
2010-01-31 19:35:41 UTC (rev 27365)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalEditorPlugin/modules/sympal_editor/templates/_editor.php
2010-01-31 20:14:14 UTC (rev 27366)
@@ -27,17 +27,19 @@
<div class="sympal_inline_edit_bar_container">
<div class="sympal_inline_edit_bar sympal_form">
-
- <div class="sympal_inline_edit_bar_publish">
- <?php if ($sf_sympal_content->getIsPublished()): ?>
- <?php echo
link_to(image_tag('/sfSympalPlugin/images/published_icon.png',
'title='.__('Published on %date%', array('%date%' =>
format_date($sf_sympal_content->getDatePublished(), 'g'))).'. '.__('Click to
unpublish content.')),
'@sympal_unpublish_content?id='.$sf_sympal_content['id']) ?>
- <?php elseif ($sf_sympal_content->getIsPublishedInTheFuture()): ?>
- <?php echo
link_to(image_tag('/sfSympalPlugin/images/future_published_icon.png',
'title='.__('Will publish on %date%', array('%date%' =>
format_date($sf_sympal_content->getDatePublished(), 'g'))).'. '.__('Click to
unpublish content.')),
'@sympal_unpublish_content?id='.$sf_sympal_content['id']) ?>
- <?php else: ?>
- <?php echo
link_to(image_tag('/sfSympalPlugin/images/unpublished_icon.png',
'title='.__('Has not been published yet.').' '.__('Click to publish
content.')), '@sympal_publish_content?id='.$sf_sympal_content['id']) ?>
- <?php endif; ?>
- </div>
+ <?php if ($sf_user->hasCredential('PublishContent')): ?>
+ <div class="sympal_inline_edit_bar_publish">
+ <?php if ($sf_sympal_content->getIsPublished()): ?>
+ <?php echo
link_to(image_tag('/sfSympalPlugin/images/published_icon.png',
'title='.__('Published on %date%', array('%date%' =>
format_date($sf_sympal_content->getDatePublished(), 'g'))).'. '.__('Click to
unpublish content.')),
'@sympal_unpublish_content?id='.$sf_sympal_content['id']) ?>
+ <?php elseif ($sf_sympal_content->getIsPublishedInTheFuture()): ?>
+ <?php echo
link_to(image_tag('/sfSympalPlugin/images/future_published_icon.png',
'title='.__('Will publish on %date%', array('%date%' =>
format_date($sf_sympal_content->getDatePublished(), 'g'))).'. '.__('Click to
unpublish content.')),
'@sympal_unpublish_content?id='.$sf_sympal_content['id']) ?>
+ <?php else: ?>
+ <?php echo
link_to(image_tag('/sfSympalPlugin/images/unpublished_icon.png',
'title='.__('Has not been published yet.').' '.__('Click to publish
content.')), '@sympal_publish_content?id='.$sf_sympal_content['id']) ?>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+
<?php echo get_sympal_inline_edit_bar_buttons() ?>
</div>
</div>
Modified:
plugins/sfSympalPlugin/trunk/test/fixtures/project/data/fresh_test_db.sqlite
===================================================================
(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.
