[Fmsystem-commits] [6540] Rental: Added delegate functionality for backend users

[Joakim Hop]

Revision: 6540
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6540
Author:   joakim_hop
Date:     2010-11-04 09:27:02 +0000 (Thu, 04 Nov 2010)
Log Message:
-----------
Rental: Added delegate functionality for backend users

Modified Paths:
--------------
    trunk/rental/inc/class.uidelegate.inc.php
    trunk/rental/inc/class.uiresultunit.inc.php
    trunk/rental/setup/phpgw_no.lang
    trunk/rental/templates/base/delegate_list.php
    trunk/rental/templates/base/resultunit_list.php

Modified: trunk/rental/inc/class.uidelegate.inc.php
===================================================================
--- trunk/rental/inc/class.uidelegate.inc.php   2010-11-04 08:23:09 UTC (rev 
6539)
+++ trunk/rental/inc/class.uidelegate.inc.php   2010-11-04 09:27:02 UTC (rev 
6540)
@@ -50,10 +50,13 @@
                
                public function add_actions(&$value, $key, $params)
                {
-                       $unit_id = $params[0];
-                       
-                       $value['ajax'][] = false;
-                       $value['actions'][] = 
html_entity_decode(link(array('menuaction' => 
'rental.uiresultunit.remove_delegate', 'id' => $unit_id, 'account_id' => 
$value['account_id'], 'owner_id' => $value['owner_id'])));
-                       $value['labels'][] = lang('remove_delegate');
+                       if(($this->isExecutiveOfficer() || 
$this->isAdministrator()))
+                       {
+                               $unit_id = $params[0];
+                               
+                               $value['ajax'][] = false;
+                               $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 
'rental.uiresultunit.remove_delegate', 'id' => $unit_id, 'account_id' => 
$value['account_id'], 'owner_id' => $value['owner_id'])));
+                               $value['labels'][] = lang('remove');
+                       }
                }
        }
\ No newline at end of file

Modified: trunk/rental/inc/class.uiresultunit.inc.php
===================================================================
--- trunk/rental/inc/class.uiresultunit.inc.php 2010-11-04 08:23:09 UTC (rev 
6539)
+++ trunk/rental/inc/class.uiresultunit.inc.php 2010-11-04 09:27:02 UTC (rev 
6540)
@@ -82,14 +82,18 @@
                
                public function add_actions(&$value)
                {
-                       $value['ajax'][] = false;
-                       $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 'rental.uiresultunit.edit', 
'id' => $value['ORG_UNIT_ID'])));
-                       $value['labels'][] = lang('edit_delegate');
+                       if(($this->isExecutiveOfficer() || 
$this->isAdministrator()))
+                       {
+                               $value['ajax'][] = false;
+                               $value['actions'][] = 
html_entity_decode(self::link(array('menuaction' => 'rental.uiresultunit.edit', 
'id' => $value['ORG_UNIT_ID'])));
+                               $value['labels'][] = lang('edit');
+                       }
                }
                
                public function edit(){
                        
                        $GLOBALS['phpgw_info']['flags']['app_header'] .= 
'::'.lang('edit');
+                       
                        $unit_id = (int)phpgw::get_var('id');
                        
                        if (isset($unit_id) && $unit_id > 0) {

Modified: trunk/rental/setup/phpgw_no.lang
===================================================================
--- trunk/rental/setup/phpgw_no.lang    2010-11-04 08:23:09 UTC (rev 6539)
+++ trunk/rental/setup/phpgw_no.lang    2010-11-04 09:27:02 UTC (rev 6540)
@@ -71,6 +71,8 @@
 billing_removed_contract_part_2        rental  no      med total pris lik 0 
kroner
 bill   rental  no      Faktura
 bill2  rental  no      Fakturér
+btn_add        rental  no      Deleger tilgang til bruker
+btn_search     rental  no      Finn bruker
 building       rental  no      Bygg
 calculations_internal_investment       rental  no      Beregningsgrunnlag 
internleie/investeringer
 calculate_price_apiece rental  no      Pris regnes per stk.
@@ -162,6 +164,9 @@
 date_start     rental  no      Gjelder fra
 decimal separator      rental  no      Skilletegn for desimaler
 delegates      rental  no      Delegering
+delegate_removed       rental  no      Delegaten ble fjernet.
+delegation_error       rental  no      Feil under delegering
+delegation_successful  rental  no      Velykket delegering
 delete rental  no      Slett
 department     rental  no      Avdeling
 deposit        rental  no      Depositum
@@ -195,6 +200,7 @@
 export_to      rental  no      Eksporter
 external       rental  no      Eksterne kontraktsparter
 facilit_import rental  no      Import fra Facilit
+failed_removing_delegate       rental  no      Det oppstod en feil under 
sletting av delegaten.
 fax    rental  no      Faks
 field_of_responsibility        rental  no      Ansvarsområde
 filters        rental  no      Filtre
@@ -249,6 +255,7 @@
 is_standard    rental  no      Standard priselement
 job_title      rental  no      Stillingstittel
 land_title     rental  no      Gnr/Bnr
+lacking_username       rental  no      Brukernavn må fylles ut
 last_edited_by_current_user    rental  no      Din siste endring
 lastname       rental  no      Etternavn
 last   rental  no      Siste
@@ -334,6 +341,7 @@
 No billing jobs found  rental  no      Ingen faktureringer funnet
 no_contracts_found     rental  no      Ingen kontrakter passet til 
søkekriteriene
 No contracts were selected.    rental  no      Du må velge minst én kontrakt 
for å faktuere.
+no_hits        rental  no      Ingen treff
 No invoices were found rental  no      Ingen fakturaer funnet
 no_name_composite      rental  no      Leieobjekt uten navn (løpenummer: %1)
 no_party_location      rental  no      Ingen intern organisasjonstilhørighet
@@ -524,10 +532,14 @@
 upload rental  no      Last opp
 url    rental  no      Nettsted
 Unable to get a location code for the building.        rental  no      Klarte 
ikke å hente objektnummer for bygget.
+username       rental  no      Brukernavn
 user_or_group  rental  no      Bruker/Gruppe
 vacant rental  no      Ledig
 view_contract  rental  no      Vis kontrakt
 unable_to_connect_to_database  rental  no      Problemer med å koble til 
databasen.
+unknown_user   rental  no      Personen finnes ikke.
+user_found_in_Fellesdata       rental  no      Personen finnes i Fellesdata.
+user_found_in_PE       rental  no      Personen er bruker av dette systemet.
 warning_billing_date_between   rental  no      Fakturastart må være innenfor 
kontraktens datoer!
 warning_due_date_between       rental  no      Opsjonsfrist må være innenfor 
kontraktens datoer!
 warning_lacking_start_date     rental  no      Kontrakten mangler start-dato!

Modified: trunk/rental/templates/base/delegate_list.php
===================================================================
--- trunk/rental/templates/base/delegate_list.php       2010-11-04 08:23:09 UTC 
(rev 6539)
+++ trunk/rental/templates/base/delegate_list.php       2010-11-04 09:27:02 UTC 
(rev 6540)
@@ -13,12 +13,12 @@
        // Defining columns for datatable
        var columnDefs = [{
                        key: "account_lastname",
-                       label: "<?php echo lang('account_lastname') ?>",
+                       label: "<?php echo lang('lastname') ?>",
                        sortable: true
                },
                {
                        key: "account_firstname",
-                       label: "<?php echo lang('account_firstname') ?>",
+                       label: "<?php echo lang('firstname') ?>",
                        sortable: true
                },
                {
@@ -43,7 +43,9 @@
                '<?php echo $list_id ?>_container',
                '<?php echo $list_id ?>_paginator',
                '<?php echo $list_id ?>',
-               '<?php echo isset($editor_action) ? $editor_action : '' ?>'
+               '<?php echo isset($editor_action) ? $editor_action : '' ?>',
+               '',
+               'true'
        );
 
 </script>

Modified: trunk/rental/templates/base/resultunit_list.php
===================================================================
--- trunk/rental/templates/base/resultunit_list.php     2010-11-04 08:23:09 UTC 
(rev 6539)
+++ trunk/rental/templates/base/resultunit_list.php     2010-11-04 09:27:02 UTC 
(rev 6540)
@@ -9,4 +9,4 @@
 $list_id = 'all_result_units';
 $url_add_on = '&amp;type=all_result_units';
 include('resultunit_list_partial.php');
-?>
+?>
\ No newline at end of file