[icinga-checkins] icinga.org: icinga-web/master: * Set new role output format per default ( fixes #2260)

git at icinga.org git at icinga.org
Mon Feb 20 17:52:42 CET 2012


Module: icinga-web
Branch: master
Commit: 5bc6b4454c6da392c9bf16e7036737787882e344
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=5bc6b4454c6da392c9bf16e7036737787882e344

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Mon Feb 20 13:10:09 2012 +0100

* Set new role output format per default (fixes #2260)

---

 .../DataProvider/GroupProviderAction.class.php     |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/modules/AppKit/actions/DataProvider/GroupProviderAction.class.php b/app/modules/AppKit/actions/DataProvider/GroupProviderAction.class.php
index 2537211..5ad07e7 100644
--- a/app/modules/AppKit/actions/DataProvider/GroupProviderAction.class.php
+++ b/app/modules/AppKit/actions/DataProvider/GroupProviderAction.class.php
@@ -29,12 +29,12 @@ class AppKit_DataProvider_GroupProviderAction extends AppKitBaseAction {
         if ($oldBehaviour == true) {
             return array(
                 'role_id' => $r->role_id,
-		'role_name' => $r->role_name,
-		'role_description' => $r->role_description,
-		'role_created' => $r->role_created,
-		'role_modified' => $r->role_modified,
-		'role_parent' => $r->role_parent,
-		'role_disabled' => $r->role_disabled
+                'role_name' => $r->role_name,
+                'role_description' => $r->role_description,
+                'role_created' => $r->role_created,
+                'role_modified' => $r->role_modified,
+                'role_parent' => $r->role_parent,
+                'role_disabled' => $r->role_disabled
             );
         }
 
@@ -50,6 +50,7 @@ class AppKit_DataProvider_GroupProviderAction extends AppKitBaseAction {
     }
     
     private function formatRole(NsmRole $r,$simple = false, $oldBehaviour = false) {
+        
         $roleObject = $this->getGroupAsArray($r, $oldBehaviour);
         if($simple)
             return $roleObject;
@@ -88,7 +89,7 @@ class AppKit_DataProvider_GroupProviderAction extends AppKitBaseAction {
         $limit = $rd->getParameter('limit',false);
         $sort = $rd->getParameter('sort',false);
         $asc = ($rd->getParameter('dir','ASC') == 'ASC');
-	$oldBehaviour = (bool)$rd->getParameter('oldBehaviour', true) ? true : false;
+        $oldBehaviour = $rd->getParameter('oldBehaviour', false);
         $user = $this->getContext()->getUser();
         $groups = null;
         





More information about the icinga-checkins mailing list