Author: Jonathan.Wage
Date: 2010-01-31 17:19:49 +0100 (Sun, 31 Jan 2010)
New Revision: 27355
Modified:
plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
Log:
[1.4][sfSympalPlugin][1.0] Fixing issue with admin menu calling isEditMode()
when not necessary
Modified: plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
2010-01-31 16:06:49 UTC (rev 27354)
+++ plugins/sfSympalPlugin/trunk/lib/helper/SympalMenuHelper.php
2010-01-31 16:19:49 UTC (rev 27355)
@@ -41,7 +41,6 @@
$sympalContext = sfSympalContext::getInstance();
$siteTitle = $sympalContext->getSite()->getTitle();
$menu = new sfSympalMenuAdminMenu('Sympal Admin');
- $menu->setCredentials(array('ViewAdminBar'));
if ($sympalContext->isAdminModule())
{
Modified:
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
===================================================================
---
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-01-31 16:06:49 UTC (rev 27354)
+++
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalAdminPlugin/config/sfSympalAdminPluginConfiguration.class.php
2010-01-31 16:19:49 UTC (rev 27355)
@@ -23,7 +23,10 @@
public function addAdminMenu()
{
- if (sfContext::getInstance()->getUser()->isEditMode())
+ $format = sfContext::getInstance()->getRequest()->getRequestFormat();
+ $format = $format ? $format : 'html';
+
+ if (sfContext::getInstance()->getUser()->hasCredential('ViewAdminBar') &&
$format == 'html')
{
$this->loadAdminMenuAssets();
@@ -38,20 +41,9 @@
$response->addJavascript(sfSympalConfig::getAssetPath('/sfSympalAdminPlugin/js/menu.js'));
}
- public function shouldLoadAdminMenu()
- {
- $format = sfContext::getInstance()->getRequest()->getRequestFormat();
- $format = $format ? $format : 'html';
-
- return sfContext::getInstance()->getUser()->isAuthenticated() && $format
== 'html';
- }
-
public function addEditorHtml(sfEvent $event, $content)
{
- if ($this->shouldLoadAdminMenu())
- {
- $content = str_replace('</body>', get_sympal_admin_menu().'</body>',
$content);
- }
+ $content = str_replace('</body>', get_sympal_admin_menu().'</body>',
$content);
return $content;
}
--
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.
