MidCOM svn: r20041 - in branches/ragnaroek/midcom/org.openpsa.contacts: . handler/group handler/person

[flack]

Author: flack
Date: Sun Jan  4 18:08:42 2009
New Revision: 20041
URL: http://trac.midgard-project.org/software/changeset/20041

Log:
small breadcrumb and typo fixes


Modified:
   branches/ragnaroek/midcom/org.openpsa.contacts/handler/group/privileges.php
   branches/ragnaroek/midcom/org.openpsa.contacts/handler/person/admin.php
   branches/ragnaroek/midcom/org.openpsa.contacts/handler/person/privileges.php
   branches/ragnaroek/midcom/org.openpsa.contacts/viewer.php

Modified: branches/ragnaroek/midcom/org.openpsa.contacts/handler/group/privileges.php
==============================================================================
--- branches/ragnaroek/midcom/org.openpsa.contacts/handler/group/privileges.php	(original)
+++ branches/ragnaroek/midcom/org.openpsa.contacts/handler/group/privileges.php	Sun Jan  4 18:08:42 2009
@@ -56,7 +56,7 @@
         $_MIDCOM->auth->require_valid_user();
         // Check if we get the group
         $this->_request_data['group'] = $this->_load($args[0]);
-        if (!this->_request_data['group'])
+        if (!$this->_request_data['group'])
         {
             return false;
         }

Modified: branches/ragnaroek/midcom/org.openpsa.contacts/handler/person/admin.php
==============================================================================
--- branches/ragnaroek/midcom/org.openpsa.contacts/handler/person/admin.php	(original)
+++ branches/ragnaroek/midcom/org.openpsa.contacts/handler/person/admin.php	Sun Jan  4 18:08:42 2009
@@ -261,6 +261,8 @@
                 // This will exit.
         }
 
+        org_openpsa_helpers::dm2_savecancel($this);
+
         $this->_prepare_request_data($handler_id);
         $_MIDCOM->set_pagetitle("{$this->_topic->extra}: {$this->_contact->name}");
         $_MIDCOM->bind_view_to_object($this->_contact, $this->_request_data['controller']->datamanager->schema->name);

Modified: branches/ragnaroek/midcom/org.openpsa.contacts/handler/person/privileges.php
==============================================================================
--- branches/ragnaroek/midcom/org.openpsa.contacts/handler/person/privileges.php	(original)
+++ branches/ragnaroek/midcom/org.openpsa.contacts/handler/person/privileges.php	Sun Jan  4 18:08:42 2009
@@ -153,8 +153,6 @@
     {
         $tmp = Array();
 
-        $tmp = array_reverse($tmp);
-
         $tmp[] = array
         (
             MIDCOM_NAV_URL => "person/{$this->_person->guid}/",
@@ -164,7 +162,7 @@
         $tmp[] = array
         (
             MIDCOM_NAV_URL => "",
-            MIDCOM_NAV_NAME => $this->_l10n->get($this->_request_data['person_action']),
+            MIDCOM_NAV_NAME => $this->_l10n->get('permissions'),
         );
 
         $_MIDCOM->set_custom_context_data('midcom.helper.nav.breadcrumb', $tmp);

Modified: branches/ragnaroek/midcom/org.openpsa.contacts/viewer.php
==============================================================================
--- branches/ragnaroek/midcom/org.openpsa.contacts/viewer.php	(original)
+++ branches/ragnaroek/midcom/org.openpsa.contacts/viewer.php	Sun Jan  4 18:08:42 2009
@@ -106,10 +106,10 @@
             );
                         
             // Match /person/privileges/GUID
-            $this->_request_switch['person_privileges'] = array
+            $this->_request_switch['group_privileges'] = array
             (
-                'handler' => array('org_openpsa_contacts_handler_person_privileges', 'privileges'),
-                'fixed_args' => array('person', 'privileges'),
+                'handler' => array('org_openpsa_contacts_handler_group_privileges', 'privileges'),
+                'fixed_args' => array('group', 'privileges'),
                 'variable_args' => 1,
             );