Author: sevein
Date: Thu Jun 21 11:31:11 2012
New Revision: 11789
Log:
Add issue number, call myUser hasGroup method instead of parent class (see
issue 2266)
Modified:
trunk/apps/qubit/modules/menu/templates/_mainMenu.php
trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_mainMenu.php
Modified: trunk/apps/qubit/modules/menu/templates/_mainMenu.php
==============================================================================
--- trunk/apps/qubit/modules/menu/templates/_mainMenu.php Thu Jun 21
11:22:48 2012 (r11788)
+++ trunk/apps/qubit/modules/menu/templates/_mainMenu.php Thu Jun 21
11:31:11 2012 (r11789)
@@ -3,11 +3,11 @@
<h2 class="element-invisible"><?php echo __('Main menu') ?></h2>
<div class="content">
- <?php // Using $user->hasGroup() since it relies on database,
+ <?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
- $isAdministrator =
$sf_user->user->hasGroup(QubitAclGroup::ADMINISTRATOR_ID) ?>
+ // See also issue 2266
+ $isAdministrator =
$sf_user->hasGroup(QubitAclGroup::ADMINISTRATOR_ID) ?>
<?php echo QubitMenu::displayHierarchyAsList($mainMenu, 0,
array('overrideVisibility' => array('admin' => $isAdministrator))) ?>
</div>
Modified: trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_mainMenu.php
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_mainMenu.php Thu Jun
21 11:22:48 2012 (r11788)
+++ trunk/plugins/qtTrilliumPlugin/modules/menu/templates/_mainMenu.php Thu Jun
21 11:31:11 2012 (r11789)
@@ -1,8 +1,8 @@
-<?php // Using $user->hasGroup() since it relies on database,
+<?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
- $isAdministrator =
$sf_user->user->hasGroup(QubitAclGroup::ADMINISTRATOR_ID); ?>
+ // 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>
--
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.
