[Fmsystem-commits] [17153] booking: more on delegated

[sigurdne]

Revision: 17153
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17153
Author:   sigurdne
Date:     2017-10-14 17:17:41 -0400 (Sat, 14 Oct 2017)
Log Message:
-----------
booking: more on delegated

Modified Paths:
--------------
    trunk/booking/inc/class.uidelegate.inc.php
    trunk/booking/inc/class.uigroup.inc.php
    trunk/booking/setup/phpgw_no.lang

Modified: trunk/booking/inc/class.uidelegate.inc.php
===================================================================
--- trunk/booking/inc/class.uidelegate.inc.php  2017-10-13 17:51:21 UTC (rev 
17152)
+++ trunk/booking/inc/class.uidelegate.inc.php  2017-10-14 21:17:41 UTC (rev 
17153)
@@ -223,6 +223,8 @@
                                $organization_id = 
phpgw::get_var('organization_id', 'int');
                                if($organization_id)
                                {
+                                       $delegate['cancel_link'] = 
self::link(array('menuaction' => $this->module . '.uiorganization.show',
+                                               'id' => $organization_id));
                                        $delegate['organization_id'] = 
$organization_id;
                                        $organization = 
CreateObject('booking.boorganization')->read_single($organization_id);
                                        $delegate['organization_name'] = 
$organization['name'];
@@ -302,7 +304,7 @@
                        self::rich_text_editor('field_description');
 
                        $tabs = array();
-                       $tab_text = ($id) ? 'Group Edit' : 'Group New';
+                       $tab_text = ($id) ? 'Delegate Edit' : 'Delegate New';
                        if (id)
                        {
                                $tabs['generic'] = array('label' => 
lang($tab_text), 'link' => '#delegate_edit');

Modified: trunk/booking/inc/class.uigroup.inc.php
===================================================================
--- trunk/booking/inc/class.uigroup.inc.php     2017-10-13 17:51:21 UTC (rev 
17152)
+++ trunk/booking/inc/class.uigroup.inc.php     2017-10-14 21:17:41 UTC (rev 
17153)
@@ -244,8 +244,11 @@
                                $group = array();
                                $group['cancel_link'] = $this->link_to('index', 
array('ui' => 'organization'));
 
+                               $organization_id = 
phpgw::get_var('organization_id', 'int');
                                if($organization_id)
                                {
+                                       $group['cancel_link'] = 
self::link(array('menuaction' => $this->module . '.uiorganization.show',
+                                               'id' => $organization_id));
                                        $group['organization_id'] = 
$organization_id;
                                        $organization = 
CreateObject('booking.boorganization')->read_single($organization_id);
                                        $group['organization_name'] = 
$organization['name'];

Modified: trunk/booking/setup/phpgw_no.lang
===================================================================
--- trunk/booking/setup/phpgw_no.lang   2017-10-13 17:51:21 UTC (rev 17152)
+++ trunk/booking/setup/phpgw_no.lang   2017-10-14 21:17:41 UTC (rev 17153)
@@ -714,4 +714,5 @@
 new delegate   booking no      Ny delegert
 please enter a delegate        booking no      Angi navn på delegert til
 please enter an email  booking no      Angi en epost
-ssn is invalid booking no      Fødselsnummeret er ikke gyldig
\ No newline at end of file
+ssn is invalid booking no      Fødselsnummeret er ikke gyldig
+edit delegate  booking no      Endre delegert til
\ No newline at end of file