[Fmsystem-commits] [10410]

[Torstein]

Revision: 10410
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10410
Author:   vator
Date:     2012-11-01 13:40:50 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/logistic/inc/class.uiactivity.inc.php
    trunk/logistic/setup/phpgw_no.lang

Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-11-01 13:17:37 UTC (rev 
10409)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-11-01 13:40:50 UTC (rev 
10410)
@@ -262,6 +262,12 @@
 
                        switch ($query_type)
                        {
+                               case 'activity_id':
+                                       $activity_id = 
phpgw::get_var('activity_id');
+                                       $filters = array('id' => $activity_id);
+                                       $result_objects = 
$this->so->get($start_index, $num_of_objects, $sort_field, $sort_ascending, 
$search_for, $search_type, $filters);
+                                       $object_count = 
$this->so->get_count($search_for, $search_type, $filters);
+                                       break;
                                default: // ... all activities, filters (active 
and vacant)
                                        phpgwapi_cache::session_set('logistic', 
'activity_query', $search_for);
                                        $filters = array('project' => 
phpgw::get_var('project'), 'user' => phpgw::get_var('user'), 'activity' => 
phpgw::get_var('filter', 'int'));
@@ -567,8 +573,8 @@
                                                        'hidden' => true
                                                ),
                                                array(
-                                                       'key' => 'delete_link',
-                                                       'label' => lang('Delete 
requirement'),
+                                                       'key' => 'status',
+                                                       'label' => 
lang('Status'),
                                                        'sortable' => false,
                                                ),
                                                array(
@@ -577,8 +583,8 @@
                                                        'sortable' => false,
                                                ),
                                                array(
-                                                       'key' => 'status',
-                                                       'label' => 
lang('Status'),
+                                                       'key' => 'delete_link',
+                                                       'label' => lang('Delete 
requirement'),
                                                        'sortable' => false,
                                                ),
                                        )

Modified: trunk/logistic/setup/phpgw_no.lang
===================================================================
--- trunk/logistic/setup/phpgw_no.lang  2012-11-01 13:17:37 UTC (rev 10409)
+++ trunk/logistic/setup/phpgw_no.lang  2012-11-01 13:40:50 UTC (rev 10410)
@@ -65,9 +65,9 @@
 Add criterias  logistic        no      Legg til kriterier
 favorites      logistic        no      Favoritter
 toggle as favorite     logistic        no      Legg til / fjern som favoritt
-Add allocation to requirement  logistic        no      Alloker ressurser til 
krav
+Add allocation to requirement  logistic        no      Bestill ressurser til 
krav
 Delete requirement     logistic        no Slett krav
-Allocate resources     logistic        no      Alloker ressurser
-Num allocated  logistic        no      Antall allokert
+Allocate resources     logistic        no      Bestill ressurser
+Num allocated  logistic        no      Antall bestilte
 Status logistic        no      Status
 Requirement allocation logistic        no      Allokering av ressurser
\ No newline at end of file