[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10052] controller: use api for yui-tables
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10052] controller: use api for yui-tables |
|
Date: |
Fri, 28 Sep 2012 08:38:19 +0000 |
Revision: 10052
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10052
Author: sigurdne
Date: 2012-09-28 08:38:19 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
controller: use api for yui-tables
Modified Paths:
--------------
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/class.uicheck_list_for_component.inc.php
trunk/controller/inc/class.uicontrol.inc.php
trunk/controller/inc/class.uicontrol_group.inc.php
trunk/controller/inc/class.uicontrol_item.inc.php
trunk/controller/inc/class.uidocument.inc.php
trunk/controller/inc/class.uiprocedure.inc.php
Removed Paths:
-------------
trunk/controller/templates/base/control/controls_datatable.xsl
trunk/controller/templates/base/control_group/control_groups_datatable.xsl
trunk/controller/templates/base/control_item/control_items_datatable.xsl
trunk/controller/templates/base/procedure/procedures_datatable.xsl
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-09-28 08:27:17 UTC
(rev 10051)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-09-28 08:38:19 UTC
(rev 10052)
@@ -101,11 +101,12 @@
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->query();
}
- self::add_javascript('controller', 'yahoo',
'datatable.js');
+ self::add_javascript('phpgwapi', 'yahoo',
'datatable.js');
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
$data = array(
+ 'datatable_name' => 'Sjekkliste (Ikke i
bruk)',
'form' => array(
'toolbar' => array(
'item' => array(
@@ -184,7 +185,7 @@
),
);
- self::render_template_xsl('datatable', $data);
+ self::render_template_xsl('datatable_common', $data);
}
/**
Modified: trunk/controller/inc/class.uicheck_list_for_component.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_component.inc.php
2012-09-28 08:27:17 UTC (rev 10051)
+++ trunk/controller/inc/class.uicheck_list_for_component.inc.php
2012-09-28 08:38:19 UTC (rev 10052)
@@ -198,7 +198,7 @@
'lists' => $lists
);
- //self::add_javascript('controller', 'yahoo',
'datatable.js');
+ //self::add_javascript('phpgwapi', 'yahoo',
'datatable.js');
self::add_javascript('controller', 'controller',
'controller_datatable_test.js');
self::add_javascript('controller', 'controller',
'jquery.js');
self::add_javascript('controller', 'controller',
'ajax.js');
@@ -206,7 +206,7 @@
//$GLOBALS['phpgw']->js->validate_file( 'yahoo',
'equipmens_location', 'controller' );
- //self::render_template_xsl('datatable', $data);
+ //self::render_template_xsl('datatable_common', $data);
self::render_template_xsl('component', $data);
*/
if(phpgw::get_var('phpgw_return_as') == 'json') {
Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php 2012-09-28 08:27:17 UTC
(rev 10051)
+++ trunk/controller/inc/class.uicontrol.inc.php 2012-09-28 08:38:19 UTC
(rev 10052)
@@ -117,7 +117,7 @@
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->query();
}
- self::add_javascript('controller', 'yahoo',
'datatable.js');
+ self::add_javascript('phpgwapi', 'yahoo',
'datatable.js');
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
@@ -139,6 +139,7 @@
// END categories
$data = array(
+ 'datatable_name' =>
'Kontroller',//lang('controls'),
'form' => array(
'toolbar' => array(
'item' => array(
@@ -240,7 +241,7 @@
),
);
- self::render_template_xsl(array(
'control/controls_datatable', 'datatable' ), $data);
+ self::render_template_xsl(array( 'datatable_common' ),
$data);
}
/**
@@ -816,7 +817,7 @@
if($sort_field == null)
{
- $sort_field = 'control_group_id';
+ $sort_field = 'controller_control.id';
}
$sort_ascending = phpgw::get_var('dir') == 'desc' ?
false : true;
Modified: trunk/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_group.inc.php 2012-09-28 08:27:17 UTC
(rev 10051)
+++ trunk/controller/inc/class.uicontrol_group.inc.php 2012-09-28 08:38:19 UTC
(rev 10052)
@@ -95,11 +95,12 @@
);
}
// END categories
- self::add_javascript('controller', 'yahoo',
'datatable.js');
+ self::add_javascript('phpgwapi', 'yahoo',
'datatable.js');
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
$data = array(
+ 'datatable_name' => 'Kontrollgrupper',
//lang('control groups'),
'form' => array(
'toolbar' => array(
'item' => array(
@@ -169,7 +170,7 @@
);
//_debug_array($data);
- self::render_template_xsl(array(
'control_group/control_groups_datatable', 'datatable' ), $data);
+ self::render_template_xsl(array( 'datatable_common' ),
$data);
}
/**
@@ -644,7 +645,7 @@
$sort_field = phpgw::get_var('sort');
if($sort_field == null)
{
- $sort_field = 'control_group_id';
+ $sort_field = 'controller_control_group.id';
}
$sort_ascending = phpgw::get_var('dir') == 'desc' ?
false : true;
//Create an empty result set
Modified: trunk/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_item.inc.php 2012-09-28 08:27:17 UTC
(rev 10051)
+++ trunk/controller/inc/class.uicontrol_item.inc.php 2012-09-28 08:38:19 UTC
(rev 10052)
@@ -105,6 +105,7 @@
// END categories
$data = array(
+ 'datatable_name' => 'Kontrollpunkter',
//lang(control items),
'form' => array(
'toolbar' => array(
'item' => array(
@@ -175,9 +176,9 @@
phpgwapi_yui::load_widget('paginator');
phpgwapi_yui::load_widget('datatable');
- self::add_javascript('controller', 'yahoo',
'datatable.js');
+ self::add_javascript('phpgwapi', 'yahoo',
'datatable.js');
- self::render_template_xsl( array(
'control_item/control_items_datatable', 'datatable' ), $data);
+ self::render_template_xsl( array( 'datatable_common' ),
$data);
}
/**
@@ -369,34 +370,41 @@
$filters['control_groups'] = $ctrl_group;
}
+
$search_for = phpgw::get_var('query');
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
{
$user_rows_per_page =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
}
- else {
+ else
+ {
$user_rows_per_page = 10;
}
// YUI variables for paging and sorting
- $start_index = phpgw::get_var('startIndex', 'int');
+ $start_index = (int)phpgw::get_var('startIndex',
'int');
$num_of_objects = phpgw::get_var('results', 'int',
'GET', $user_rows_per_page);
$sort_field = phpgw::get_var('sort');
if($sort_field == null)
{
- $sort_field = 'control_item_id';
+ $sort_field = 'id';
}
+
if(phpgw::get_var('sort_dir') == 'desc')
+ {
$sort_ascending = false;
+ }
else
+ {
$sort_ascending = phpgw::get_var('dir') ==
'desc' ? false : true;
+ }
//Create an empty result set
$records = array();
//Retrieve a contract identifier and load corresponding
contract
$control_item_id = phpgw::get_var('control_item_id');
- if(isset($control_item_id))
+ if(isset($control_item_id) && $control_item_id)
{
$control_item =
$this->so->get_single($control_item_id);
}
Modified: trunk/controller/inc/class.uidocument.inc.php
===================================================================
--- trunk/controller/inc/class.uidocument.inc.php 2012-09-28 08:27:17 UTC
(rev 10051)
+++ trunk/controller/inc/class.uidocument.inc.php 2012-09-28 08:38:19 UTC
(rev 10052)
@@ -477,18 +477,20 @@
public function document_types()
{
- if(phpgw::get_var('phpgw_return_as') == 'json') {
+ if(phpgw::get_var('phpgw_return_as') == 'json')
+ {
return $this->get_document_types();
self::render_template_xsl(array('procedure/procedure_tabs',
'common',
'procedure/procedure_documents'),
$data);
}
- self::add_javascript('controller', 'yahoo', 'datatable.js');
+ self::add_javascript('phpgwapi', 'yahoo', 'datatable.js');
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
$data = array(
+ 'datatable_name' => 'Dokument typer',
'form' => array(
),
'datatable' => array(
@@ -514,6 +516,6 @@
),
);
- self::render_template_xsl('datatable', $data);
+ self::render_template_xsl('datatable_common', $data);
}
}
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2012-09-28 08:27:17 UTC
(rev 10051)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2012-09-28 08:38:19 UTC
(rev 10052)
@@ -76,7 +76,7 @@
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->query();
}
- self::add_javascript('controller', 'yahoo',
'datatable.js');
+ self::add_javascript('phpgwapi', 'yahoo',
'datatable.js');
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
@@ -98,6 +98,7 @@
// END as categories
$data = array(
+ 'datatable_name' =>
'Prosedyrer', //lang('procedures'),
'form' => array(
'toolbar' => array(
'item' => array(
@@ -161,7 +162,7 @@
),
);
- self::render_template_xsl(array(
'procedure/procedures_datatable', 'datatable' ), $data);
+ self::render_template_xsl(array( 'datatable_common' ),
$data);
}
public function edit()
@@ -615,7 +616,8 @@
{
$user_rows_per_page =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
}
- else {
+ else
+ {
$user_rows_per_page = 10;
}
// YUI variables for paging and sorting
@@ -635,7 +637,8 @@
$exp_param = phpgw::get_var('export');
$export = false;
- if(isset($exp_param)){
+ if(isset($exp_param) && $exp_param)
+ {
$export=true;
$num_of_objects = null;
}
@@ -654,7 +657,8 @@
//Create an empty row set
$rows = array();
- foreach($result_objects as $result) {
+ foreach($result_objects as $result)
+ {
if(isset($result))
{
$rows[] = $result->serialize();
@@ -671,7 +675,8 @@
$editable = phpgw::get_var('editable') == 'true' ? true
: false;
- if(!$export){
+ if(!$export)
+ {
//Add action column to each row in result table
array_walk(
$result_data['results'],
Deleted: trunk/controller/templates/base/control/controls_datatable.xsl
===================================================================
--- trunk/controller/templates/base/control/controls_datatable.xsl
2012-09-28 08:27:17 UTC (rev 10051)
+++ trunk/controller/templates/base/control/controls_datatable.xsl
2012-09-28 08:38:19 UTC (rev 10052)
@@ -1,13 +0,0 @@
-<!-- $Id: view_locations_for_control.xsl 9485 2012-06-04 08:39:52Z vator $ -->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
-<div id="main_content">
-
- <h1>Kontroller</h1>
-
- <div class="content-wrp">
- <xsl:call-template name="datatable" />
- </div>
-</div>
-</xsl:template>
Deleted:
trunk/controller/templates/base/control_group/control_groups_datatable.xsl
===================================================================
--- trunk/controller/templates/base/control_group/control_groups_datatable.xsl
2012-09-28 08:27:17 UTC (rev 10051)
+++ trunk/controller/templates/base/control_group/control_groups_datatable.xsl
2012-09-28 08:38:19 UTC (rev 10052)
@@ -1,13 +0,0 @@
-<!-- $Id: view_locations_for_control.xsl 9485 2012-06-04 08:39:52Z vator $ -->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
-<div id="main_content">
-
- <h1>Kontrollgrupper</h1>
-
- <div id="control_items" class="content-wrp">
- <xsl:call-template name="datatable" />
- </div>
-</div>
-</xsl:template>
Deleted:
trunk/controller/templates/base/control_item/control_items_datatable.xsl
===================================================================
--- trunk/controller/templates/base/control_item/control_items_datatable.xsl
2012-09-28 08:27:17 UTC (rev 10051)
+++ trunk/controller/templates/base/control_item/control_items_datatable.xsl
2012-09-28 08:38:19 UTC (rev 10052)
@@ -1,13 +0,0 @@
-<!-- $Id: view_locations_for_control.xsl 9485 2012-06-04 08:39:52Z vator $ -->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
-<div id="main_content">
-
- <h1>Kontrollpunkter</h1>
-
- <div id="control_items" class="content-wrp">
- <xsl:call-template name="datatable" />
- </div>
-</div>
-</xsl:template>
Deleted: trunk/controller/templates/base/procedure/procedures_datatable.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedures_datatable.xsl
2012-09-28 08:27:17 UTC (rev 10051)
+++ trunk/controller/templates/base/procedure/procedures_datatable.xsl
2012-09-28 08:38:19 UTC (rev 10052)
@@ -1,13 +0,0 @@
-<!-- $Id: view_locations_for_control.xsl 9485 2012-06-04 08:39:52Z vator $ -->
-
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
-<div id="main_content">
-
- <h1>Prosedyrer</h1>
-
- <div id="control_items" class="content-wrp">
- <xsl:call-template name="datatable" />
- </div>
-</div>
-</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10052] controller: use api for yui-tables,
Sigurd Nes <=