Author: david
Date: Thu Jun 21 16:49:27 2012
New Revision: 11791
Log:
Merge r11788 and r11789 (fixes issue 2266) from qubit trunk
Modified:
branches/ica-atom/ (props changed)
branches/ica-atom/apps/qubit/modules/actor/actions/contextMenuComponent.class.php
(props changed)
branches/ica-atom/apps/qubit/modules/menu/templates/_mainMenu.php
branches/ica-atom/favicon.ico (props changed)
branches/ica-atom/images/logo.png (props changed)
branches/ica-atom/plugins/qbAclPlugin/lib/vendor/Zend/ (props changed)
branches/ica-atom/plugins/qtTrilliumPlugin/modules/menu/templates/_mainMenu.php
branches/ica-atom/plugins/sfDrupalPlugin/vendor/drupal/ (props changed)
branches/ica-atom/vendor/symfony/ (props changed)
branches/ica-atom/vendor/symfony/lib/task/i18n/sfI18nExtractPluginTask.class.php
(props changed)
branches/ica-atom/vendor/yui/ (props changed)
Modified: branches/ica-atom/apps/qubit/modules/menu/templates/_mainMenu.php
==============================================================================
--- branches/ica-atom/apps/qubit/modules/menu/templates/_mainMenu.php Thu Jun
21 16:20:36 2012 (r11790)
+++ branches/ica-atom/apps/qubit/modules/menu/templates/_mainMenu.php Thu Jun
21 16:49:27 2012 (r11791)
@@ -3,7 +3,13 @@
<h2 class="element-invisible"><?php echo __('Main menu') ?></h2>
<div class="content">
- <?php echo QubitMenu::displayHierarchyAsList($mainMenu, 0,
array('overrideVisibility' => array('admin' =>
$sf_user->hasCredential('administrator')))) ?>
+ <?php // Using $sf_user->hasGroup() since it relies on database,
+ // $sf_user->hasCredential('administrator') relies on session storage
+ // This adds more db access but we are caching anyways
+ // See also issue 2266
+ $isAdministrator =
$sf_user->hasGroup(QubitAclGroup::ADMINISTRATOR_ID) ?>
+ <?php echo QubitMenu::displayHierarchyAsList($mainMenu, 0,
array('overrideVisibility' => array('admin' => $isAdministrator))) ?>
</div>
+
</div>
Modified:
branches/ica-atom/plugins/qtTrilliumPlugin/modules/menu/templates/_mainMenu.php
==============================================================================
---
branches/ica-atom/plugins/qtTrilliumPlugin/modules/menu/templates/_mainMenu.php
Thu Jun 21 16:20:36 2012 (r11790)
+++
branches/ica-atom/plugins/qtTrilliumPlugin/modules/menu/templates/_mainMenu.php
Thu Jun 21 16:49:27 2012 (r11791)
@@ -1,19 +1,27 @@
+<?php // Using $sf_user->hasGroup() since it relies on database,
+ // $sf_user->hasCredential('administrator') relies on session storage
+ // This adds more db access but we are caching anyways
+ // See also issue 2266
+ $isAdministrator = $sf_user->hasGroup(QubitAclGroup::ADMINISTRATOR_ID) ?>
+
<li class="menu add">
<a href="#" class="menu"><?php echo
$addMenu->getLabel(array('cultureFallback' => true)) ?></a>
- <?php echo QubitMenu::displayHierarchyAsList($addMenu, 0,
array('overrideVisibility' => array('admin' =>
$sf_user->hasCredential('administrator')))) ?>
+ <?php echo QubitMenu::displayHierarchyAsList($addMenu, 0,
array('overrideVisibility' => array('admin' => $isAdministrator))) ?>
</li>
<li class="menu">
<a href="#" class="menu"><?php echo
$manageMenu->getLabel(array('cultureFallback' => true)) ?></a>
- <?php echo QubitMenu::displayHierarchyAsList($manageMenu, 0,
array('overrideVisibility' => array('admin' =>
$sf_user->hasCredential('administrator')))) ?>
+ <?php echo QubitMenu::displayHierarchyAsList($manageMenu, 0,
array('overrideVisibility' => array('admin' => $isAdministrator))) ?>
</li>
<li class="menu">
<a href="#" class="menu"><?php echo
$importMenu->getLabel(array('cultureFallback' => true)) ?></a>
- <?php echo QubitMenu::displayHierarchyAsList($importMenu, 0,
array('overrideVisibility' => array('admin' =>
$sf_user->hasCredential('administrator')))) ?>
+ <?php echo QubitMenu::displayHierarchyAsList($importMenu, 0,
array('overrideVisibility' => array('admin' => $isAdministrator))) ?>
</li>
-<li class="menu">
- <a href="#" class="menu"><?php echo
$adminMenu->getLabel(array('cultureFallback' => true)) ?></a>
- <?php echo QubitMenu::displayHierarchyAsList($adminMenu, 0,
array('overrideVisibility' => array('admin' =>
$sf_user->hasCredential('administrator')))) ?>
-</li>
+<?php if ($isAdministrator): ?>
+ <li class="menu">
+ <a href="#" class="menu"><?php echo
$adminMenu->getLabel(array('cultureFallback' => true)) ?></a>
+ <?php echo QubitMenu::displayHierarchyAsList($adminMenu, 0,
array('overrideVisibility' => array('admin' => $isAdministrator))) ?>
+ </li>
+<?php endif; ?>
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" 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/qubit-commits?hl=en.
