[Fmsystem-commits] [12306] use popup helper for columns selection

[Sigurd Nes]

Revision: 12306
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12306
Author:   sigurdne
Date:     2014-11-13 11:29:31 +0000 (Thu, 13 Nov 2014)
Log Message:
-----------
use popup helper for columns selection

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

Modified: branches/dev-syncromind/property/inc/class.uigeneric.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uigeneric.inc.php        
2014-11-13 11:27:50 UTC (rev 12305)
+++ branches/dev-syncromind/property/inc/class.uigeneric.inc.php        
2014-11-13 11:29:31 UTC (rev 12306)
@@ -328,7 +328,7 @@
                                                                'value' => 
lang('columns'),
                                                                'href' => '#',
                                                                'class' => '',
-                                                               'onclick'=> 
"choose_columns({menuaction:'property.uigeneric.columns', 
appname:'{$this->bo->appname}',type:'{$this->type}', 
type_id:'{$this->type_id}'})"
+                                                               'onclick'=> 
"JqueryPortico.openPopup({menuaction:'property.uigeneric.columns', 
appname:'{$this->bo->appname}',type:'{$this->type}', 
type_id:'{$this->type_id}'}, {closeAction:'reload'})"
                                                        )
                                                )
                                        )
@@ -476,10 +476,6 @@
                                        );
                        }
 
-                       self::add_javascript('property', 'portico', 
'generic.index.js');
-                       self::add_javascript('phpgwapi', 'tinybox2', 
'packed.js');
-                       
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
-               
                        self::render_template_xsl('datatable_jquery', $data);
 
                }

Modified: branches/dev-syncromind/property/inc/class.uilocation.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uilocation.inc.php       
2014-11-13 11:27:50 UTC (rev 12305)
+++ branches/dev-syncromind/property/inc/class.uilocation.inc.php       
2014-11-13 11:29:31 UTC (rev 12306)
@@ -333,7 +333,7 @@
 
                function columns()
                {
-                       //                      
phpgwapi_yui::load_widget('tabview');
+                       $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
                        $receipt = array();
                        $GLOBALS['phpgw']->xslttpl->add_file(array('columns'));
 
@@ -821,6 +821,13 @@
                                                                        
'parent' =>  $this->location_code                                               
        
                                                                        )),
                                                                'class' => 
'new_item'
+                                                       ),
+                                                       array(
+                                                               'type' => 
'link',
+                                                               'value' => 
lang('columns'),
+                                                               'href' => '#',
+                                                               'class' => '',
+                                                               'onclick'=> 
"JqueryPortico.openPopup({menuaction:'property.uilocation.columns', 
type_id:'{$type_id}',parent:'{$this->location_code}'}, {closeAction:'reload'})"
                                                        )
                                                )
                                        )
@@ -1290,6 +1297,9 @@
 
                function edit($view = '')
                {
+                       
+                       $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
+
                        $get_history            = phpgw::get_var('get_history', 
'bool', 'POST');
                        $change_type            = phpgw::get_var('change_type', 
'int', 'POST');
                        $lookup_tenant          = 
phpgw::get_var('lookup_tenant', 'bool');