|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [14707] more fixes |
| Date: | Mon, 08 Feb 2016 13:21:18 +0000 |
Revision: 14707
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14707
Author: sigurdne
Date: 2016-02-08 13:21:18 +0000 (Mon, 08 Feb 2016)
Log Message:
-----------
more fixes
Modified Paths:
--------------
branches/dev-syncromind/controller/inc/class.uicontrol.inc.php
branches/dev-syncromind/controller/inc/class.uicontrol_group.inc.php
branches/dev-syncromind/controller/inc/class.uicontrol_item.inc.php
branches/dev-syncromind/controller/inc/class.uiprocedure.inc.php
branches/dev-syncromind/rental/inc/class.uicomposite.inc.php
branches/dev-syncromind/rental/inc/class.uicontract.inc.php
Modified: branches/dev-syncromind/controller/inc/class.uicontrol.inc.php
===================================================================
--- branches/dev-syncromind/controller/inc/class.uicontrol.inc.php
2016-02-08 12:35:50 UTC (rev 14706)
+++ branches/dev-syncromind/controller/inc/class.uicontrol.inc.php
2016-02-08 13:21:18 UTC (rev 14707)
@@ -203,18 +203,13 @@
'text' =>
lang('district'),
'list' =>
$district_list,
),
- array(
- 'type' =>
'link',
- 'value' =>
lang('New control'),
- 'href' =>
self::link(array('menuaction' => 'controller.uicontrol.view_control_details')),
- 'class' =>
'new_item'
- ),
),
),
),
'datatable' => array(
'source' =>
self::link(array('menuaction' =>
'controller.uicontrol.control_list',
'phpgw_return_as' =>
'json')),
+ 'new_item' =>
self::link(array('menuaction' => 'controller.uicontrol.view_control_details')),
'allrows' => true,
'field' => array(
array(
@@ -261,6 +256,28 @@
'formatter' =>
'JqueryPortico.formatLinkGeneric'
);
}
+ $parameters = array
+ (
+ 'parameter' => array
+ (
+ array
+ (
+ 'name' => 'id',
+ 'source' => 'id'
+ ),
+ )
+ );
+ $data['datatable']['actions'][] = array
+ (
+ 'my_name' => 'view',
+ 'statustext' => lang('view'),
+ 'text' => lang('view'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php', array
+ (
+ 'menuaction' =>
'controller.uicontrol.view_control_details'
+ )),
+ 'parameters' => json_encode($parameters)
+ );
self::render_template_xsl(array('datatable_jquery'),
$data);
}
Modified: branches/dev-syncromind/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- branches/dev-syncromind/controller/inc/class.uicontrol_group.inc.php
2016-02-08 12:35:50 UTC (rev 14706)
+++ branches/dev-syncromind/controller/inc/class.uicontrol_group.inc.php
2016-02-08 13:21:18 UTC (rev 14707)
@@ -116,19 +116,14 @@
'name' =>
'control_areas',
'text' =>
lang('Control_area'),
'list' =>
$control_areas_array2,
- ),
- array(
- 'type' =>
'link',
- 'value' =>
lang('New control group'),
- 'href' =>
self::link(array('menuaction' => 'controller.uicontrol_group.add')),
- 'class' =>
'new_item'
- ),
+ )
),
),
),
'datatable' => array(
'source' =>
self::link(array('menuaction' =>
'controller.uicontrol_group.index',
'phpgw_return_as' =>
'json')),
+ 'new_item' =>
self::link(array('menuaction' => 'controller.uicontrol_group.add')),
'allrows' => true,
'field' => array(
array(
@@ -164,8 +159,30 @@
)
),
);
-//_debug_array($data);
+ $parameters = array
+ (
+ 'parameter' => array
+ (
+ array
+ (
+ 'name' => 'id',
+ 'source' => 'id'
+ ),
+ )
+ );
+ $data['datatable']['actions'][] = array
+ (
+ 'my_name' => 'view',
+ 'statustext' => lang('view'),
+ 'text' => lang('view'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php', array
+ (
+ 'menuaction' =>
'controller.uicontrol_group.view'
+ )),
+ 'parameters' => json_encode($parameters)
+ );
+
self::render_template_xsl(array('datatable_jquery'),
$data);
}
Modified: branches/dev-syncromind/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- branches/dev-syncromind/controller/inc/class.uicontrol_item.inc.php
2016-02-08 12:35:50 UTC (rev 14706)
+++ branches/dev-syncromind/controller/inc/class.uicontrol_item.inc.php
2016-02-08 13:21:18 UTC (rev 14707)
@@ -128,18 +128,13 @@
'name' =>
'control_areas',
'text' =>
lang('Control_area'),
'list' =>
$control_areas_array2,
- ),
- array(
- 'type' =>
'link',
- 'value' =>
lang('New control item'),
- 'href' =>
self::link(array('menuaction' => 'controller.uicontrol_item.add')),
- 'class' =>
'new_item'
- ),
- ),
- ),
+ )
+ )
+ )
),
'datatable' => array(
'source' =>
self::link($query_array),
+ 'new_item' =>
self::link(array('menuaction' => 'controller.uicontrol_item.add')),
'allrows' => true,
'field' => array(
array(
@@ -175,6 +170,28 @@
)
),
);
+ $parameters = array
+ (
+ 'parameter' => array
+ (
+ array
+ (
+ 'name' => 'id',
+ 'source' => 'id'
+ ),
+ )
+ );
+ $data['datatable']['actions'][] = array
+ (
+ 'my_name' => 'view',
+ 'statustext' => lang('view'),
+ 'text' => lang('view'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php', array
+ (
+ 'menuaction' =>
'controller.uicontrol_item.view'
+ )),
+ 'parameters' => json_encode($parameters)
+ );
self::render_template_xsl(array('datatable_jquery'),
$data);
}
Modified: branches/dev-syncromind/controller/inc/class.uiprocedure.inc.php
===================================================================
--- branches/dev-syncromind/controller/inc/class.uiprocedure.inc.php
2016-02-08 12:35:50 UTC (rev 14706)
+++ branches/dev-syncromind/controller/inc/class.uiprocedure.inc.php
2016-02-08 13:21:18 UTC (rev 14707)
@@ -112,19 +112,14 @@
'name' =>
'control_areas',
'text' =>
lang('Control_area') . ':',
'list' =>
$control_areas_array2,
- ),
- array(
- 'type' =>
'link',
- 'value' =>
lang('t_new_procedure'),
- 'href' =>
self::link(array('menuaction' => 'controller.uiprocedure.add')),
- 'class' =>
'new_item'
- ),
+ )
),
),
),
'datatable' => array(
'source' =>
self::link(array('menuaction' => 'controller.uiprocedure.index',
'phpgw_return_as' =>
'json')),
+ 'new_item' =>
self::link(array('menuaction' => 'controller.uiprocedure.add')),
'allrows' => true,
'field' => array(
array(
@@ -161,6 +156,29 @@
),
);
+ $parameters = array
+ (
+ 'parameter' => array
+ (
+ array
+ (
+ 'name' => 'id',
+ 'source' => 'id'
+ ),
+ )
+ );
+ $data['datatable']['actions'][] = array
+ (
+ 'my_name' => 'view',
+ 'statustext' => lang('view'),
+ 'text' => lang('view'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php', array
+ (
+ 'menuaction' =>
'controller.uiprocedure.view'
+ )),
+ 'parameters' => json_encode($parameters)
+ );
+
self::render_template_xsl(array('datatable_jquery'),
$data);
}
Modified: branches/dev-syncromind/rental/inc/class.uicomposite.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uicomposite.inc.php
2016-02-08 12:35:50 UTC (rev 14706)
+++ branches/dev-syncromind/rental/inc/class.uicomposite.inc.php
2016-02-08 13:21:18 UTC (rev 14707)
@@ -449,7 +449,8 @@
)),
'allrows' => true,
'editor_action' => '',
- 'field' => array()
+ 'field' => array(),
+ 'query' =>
phpgw::get_var('search_for')
)
);
Modified: branches/dev-syncromind/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/dev-syncromind/rental/inc/class.uicontract.inc.php 2016-02-08
12:35:50 UTC (rev 14706)
+++ branches/dev-syncromind/rental/inc/class.uicontract.inc.php 2016-02-08
13:21:18 UTC (rev 14707)
@@ -1082,6 +1082,7 @@
)),
'allrows' => true,
'editor_action' => '',
+ 'query' =>
phpgw::get_var('search_for'),
'field' => array(
array(
'key' =>
'old_contract_id',
| [Prev in Thread] | Current Thread | [Next in Thread] |