[Fmsystem-commits] [15754]

[nelson . guerra]

Revision: 15754
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15754
Author:   nelson224
Date:     2016-09-29 01:33:09 +0000 (Thu, 29 Sep 2016)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.uiimport_components.inc.php

Modified: 
branches/dev-syncromind-2/property/inc/class.uiimport_components.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uiimport_components.inc.php    
2016-09-29 01:32:53 UTC (rev 15753)
+++ branches/dev-syncromind-2/property/inc/class.uiimport_components.inc.php    
2016-09-29 01:33:09 UTC (rev 15754)
@@ -115,11 +115,15 @@
                }
                
                public function import_component_files()
-               {
-                       $location_code = 
phpgwapi_cache::session_get('property', 'location_code');
+               {               
+                       /*$location_code = 
phpgwapi_cache::session_get('property', 'location_code');
                        $id = phpgwapi_cache::session_get('property', 
'location_item_id');
-                       $attrib_name_componentID = 
phpgwapi_cache::session_get('property', 'attrib_name_componentID');
+                       $attrib_name_componentID = 
phpgwapi_cache::session_get('property', 'attrib_name_componentID');*/
                        
+                       $location_code = phpgw::get_var('location_code');
+                       $id = phpgw::get_var('location_item_id');
+                       $attrib_name_componentID = 
phpgw::get_var('attribute_name_component_id');
+                       
                        if (!$attrib_name_componentID)
                        {
                                $receipt['error'][] = array('msg' => 
lang('Choose attribute name for Component ID'));
@@ -657,8 +661,8 @@
                {
                        $tabs = array();
                        $tabs['locations'] = array('label' => 
lang('Locations'), 'link' => '#locations');
+                       $tabs['components'] = array('label' => 
lang('Components'), 'link' => '#components', 'disable' => 1);
                        $tabs['files'] = array('label' => lang('Files'), 'link' 
=> '#files', 'disable' => 0);
-                       $tabs['components'] = array('label' => 
lang('Components'), 'link' => '#components', 'disable' => 1);
                        $tabs['relations'] = array('label' => 
lang('Relations'), 'link' => '#relations', 'disable' => 1);
                                        
                        $active_tab = 'locations';
@@ -673,8 +677,8 @@
 
                        $related_def = array
                                (
-                               array('key' => 'location_code', 'label' => 
lang('location'), 'sortable' => false, 'resizeable' => true),
-                               array('key' => 'loc1_name', 'label' => 
lang('name'), 'sortable' => false, 'resizeable' => true)
+                               array('key' => 'location_code', 'label' => 
lang('location'), 'sortable' => true, 'resizeable' => true),
+                               array('key' => 'loc1_name', 'label' => 
lang('name'), 'sortable' => true, 'resizeable' => true)
                        );