[Gemstracker-svn] SF.net SVN: gemstracker:[841] trunk/library/classes

[<gem...@li...>]

Revision: 841
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=841&view=rev
Author:   mennodekker
Date:     2012-07-13 10:04:47 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Allow to export staff to excel + in detailed view roles won't be cut off

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/RoleAction.php
    trunk/library/classes/Gems/Menu/MenuAbstract.php
    trunk/library/classes/GemsEscort.php

Modified: trunk/library/classes/Gems/Default/RoleAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RoleAction.php	2012-07-13 10:02:53 UTC (rev 840)
+++ trunk/library/classes/Gems/Default/RoleAction.php	2012-07-13 10:04:47 UTC (rev 841)
@@ -235,7 +235,10 @@
         $tp = new MUtil_Model_Type_ConcatenatedRow(',', ', ');
         $tp->apply($model, 'grl_parents');
 
-        $model->set('grl_privileges', 'label', $this->_('Privileges'), 'formatFunction', array($this, 'formatLongLine'));
+        $model->set('grl_privileges', 'label', $this->_('Privileges'));
+        if (!$detailed) {
+            $model->set('grl_privileges', 'formatFunction', array($this, 'formatLongLine'));
+        }
 
         Gems_Model::setChangeFieldsByPrefix($model, 'grl');
 

Modified: trunk/library/classes/Gems/Menu/MenuAbstract.php
===================================================================
--- trunk/library/classes/Gems/Menu/MenuAbstract.php	2012-07-13 10:02:53 UTC (rev 840)
+++ trunk/library/classes/Gems/Menu/MenuAbstract.php	2012-07-13 10:04:47 UTC (rev 841)
@@ -409,6 +409,7 @@
         $pages[] = $page->addEditAction();
         $pages[] = $page->addAction($this->_('Reset password'), 'pr.staff.edit', 'reset')->setModelParameters(1);
         $pages[] = $page->addDeleteAction();
+        $pages[] = $page->addExcelAction();
         if (! $this->escort->hasPrivilege('pr.staff.edit.all')) {
             $filter = array_keys($this->escort->loader->getCurrentUser()->getAllowedOrganizations());
             foreach ($pages as $sub_page) {

Modified: trunk/library/classes/GemsEscort.php
===================================================================
--- trunk/library/classes/GemsEscort.php	2012-07-13 10:02:53 UTC (rev 840)
+++ trunk/library/classes/GemsEscort.php	2012-07-13 10:04:47 UTC (rev 841)
@@ -430,7 +430,7 @@
      */
     protected function _initTranslate()
     {
-        $this->bootstrap('locale');
+        $this->bootstrap('locale');      
 
         $language = $this->locale->getLanguage();
 
@@ -516,9 +516,8 @@
         return $view;
     }
 
-    protected function _initZFDebug()
-    {
-        /*
+    /*protected function _initZFDebug()
+    {        
         // if ((APPLICATION_ENV === 'development') &&
         if ((APPLICATION_ENV !== 'production') &&
             (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 6.') === FALSE)) {
@@ -546,8 +545,8 @@
             $this->bootstrap('frontController');
             $frontController = $this->getResource('frontController');
             $frontController->registerPlugin($debug);
-        } // */
-    }
+        } 
+    }// */
 
     /**
      * Function called if specified in the Project.ini layoutPrepare section before

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.