[Fmsystem-commits] [12361]

[Nelson Guerra]

Revision: 12361
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12361
Author:   nelson224
Date:     2014-11-21 22:08:14 +0000 (Fri, 21 Nov 2014)
Log Message:
-----------


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

Modified: branches/dev-syncromind/property/inc/class.uientity.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uientity.inc.php 2014-11-21 
22:07:53 UTC (rev 12360)
+++ branches/dev-syncromind/property/inc/class.uientity.inc.php 2014-11-21 
22:08:14 UTC (rev 12361)
@@ -705,7 +705,8 @@
                                                        ),
                                                        array
                                                        (//for link "None",
-                                                               'type'=> 
'label_org_unit'
+                                                               'type'  => 
'label',
+                                                               'id'    => 
'label_org_unit_id'
                                                        ),
                                                        array
                                                        ( //hidden org_unit_id
@@ -720,7 +721,7 @@
                                                                'value' => 
lang('department'),
                                                                'href'  => '#',
                                                                'class' => '',
-                                                               'onclick' => 
"JqueryPortico.openPopup({menuaction:'property.uilookup.custom', 
column:'org_unit', type:'org_unit'}, {closeAction:'reload'})"
+                                                               'onclick' => 
"JqueryPortico.openPopup({menuaction:'property.uilookup.custom', 
column:'org_unit_id', type:'org_unit'})"
                                                        ),
                                                        array
                                                        (
@@ -836,12 +837,17 @@
                                        $params['formatter'] = 
'JqueryPortico.searchLink';
                                }
 
+                               if($uicols['name'][$k] == 'nhk_link')
+                               {
+                                       $params['formatter'] = 
'JqueryPortico.formatLinkGeneric';
+                               }
+                               
                                if($uicols['name'][$k] == 'num')
                                {
                                        $params['formatter'] = 
'JqueryPortico.formatLink';
                                        $params['hidden'] = false;
                                }
-
+                               
                                $denied = array('merknad');
                                if(in_array ($uicols['name'][$k], $denied))
                                {