[Fmsystem-commits] [14752] Merge 14750:14751 from trunk

[Sigurd Nes]

Revision: 14752
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14752
Author:   sigurdne
Date:     2016-02-17 17:50:47 +0000 (Wed, 17 Feb 2016)
Log Message:
-----------
Merge 14750:14751 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/property/inc/class.uiasync.inc.php
    branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
    
branches/Version-2_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php

Property Changed:
----------------
    branches/Version-2_0-branch/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749
   + /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751

Modified: branches/Version-2_0-branch/property/inc/class.uiasync.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiasync.inc.php      
2016-02-17 17:40:41 UTC (rev 14751)
+++ branches/Version-2_0-branch/property/inc/class.uiasync.inc.php      
2016-02-17 17:50:47 UTC (rev 14752)
@@ -298,6 +298,17 @@
                        $result_count = 0;
 
                        $values = $this->bo->read($params);
+                       foreach ($values as &$entry)
+                       {
+                               $entry['url']   = "{$entry['name']}&data=" . 
urlencode(urlencode($entry['data']));
+                               $data_set = unserialize($entry['data']);
+                               $method_data=array();
+                               foreach ($data_set as $key => $value)
+                               {
+                                       $method_data[] = "{$key}={$value}";
+                               }
+                               $entry['data']  = @implode (',',$method_data);
+                       }
 
                        if (phpgw::get_var('export', 'bool'))
                        {

Modified: branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uilocation.inc.php   
2016-02-17 17:40:41 UTC (rev 14751)
+++ branches/Version-2_0-branch/property/inc/class.uilocation.inc.php   
2016-02-17 17:50:47 UTC (rev 14752)
@@ -743,7 +743,7 @@
 
                function index()
                {
-                       $type_id = phpgw::get_var('type_id');
+                       $type_id = phpgw::get_var('type_id','int', 'GET', 1);
                        // $lookup use for pop-up
                        $lookup = phpgw::get_var('lookup');
                        // $lookup_name use in pop-up option "project"

Modified: 
branches/Version-2_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
===================================================================
--- 
branches/Version-2_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
     2016-02-17 17:40:41 UTC (rev 14751)
+++ 
branches/Version-2_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
     2016-02-17 17:50:47 UTC (rev 14752)
@@ -41,8 +41,8 @@
                        parent::__construct();
 
                        $this->function_name = get_class($this);
-                       $this->sub_location = lang('catch');
-                       $this->function_msg = 'Import info from files';
+                       $this->sub_location = lang('property');
+                       $this->function_msg = 'Synkroniser avdelinger med 
Fellesdata';
                }
 
                function execute()