[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16007] more on generic docs
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [16007] more on generic docs |
Date: |
Fri, 18 Nov 2016 15:26:01 +0000 (UTC) |
Revision: 16007
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16007
Author: sigurdne
Date: 2016-11-18 15:26:00 +0000 (Fri, 18 Nov 2016)
Log Message:
-----------
more on generic docs
Modified Paths:
--------------
trunk/property/inc/class.uigeneric_document.inc.php
Modified: trunk/property/inc/class.uigeneric_document.inc.php
===================================================================
--- trunk/property/inc/class.uigeneric_document.inc.php 2016-11-18 14:44:56 UTC
(rev 16006)
+++ trunk/property/inc/class.uigeneric_document.inc.php 2016-11-18 15:26:00 UTC
(rev 16007)
@@ -289,6 +289,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $mode = phpgw::get_var('mode');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -323,7 +324,17 @@
$values = array();
foreach($locations as $item)
{
- $checked = in_array($item['id'],
$values_location_item_id) ? 'checked="checked"' : '';
+ if($mode == 'edit')
+ {
+ $checked = in_array($item['id'],
$values_location_item_id) ? ' checked="checked"' : '';
+ $relate = "<input value='{$item['id']}'
class='components mychecks' type='checkbox'{$checked}>";
+
+ }
+ else
+ {
+ $relate = in_array($item['id'],
$values_location_item_id) ? 'X' : '';
+ $checked = $relate;
+ }
if ($only_related && empty($checked))
{
@@ -333,7 +344,7 @@
$values[] = array(
'location_code' => '<a
href="'.self::link(array('menuaction' => 'property.uilocation.view',
'location_code' => $item['location_code'])).'">'.$item['location_code'].'</a>',
'loc1_name' => $item['loc1_name'],
- 'relate' => '<input
value="'.$item['id'].'" class="locations mychecks" type="checkbox"
'.$checked.'>'
+ 'relate' => $relate
);
}
@@ -459,7 +470,7 @@
(
'container' => 'datatable-container_0',
'requestUrl' =>
json_encode(self::link(array('menuaction' =>
'property.uigeneric_document.get_componentes',
- 'id' => $id,
'location_id' => $values_location[0]['id'], 'phpgw_return_as' => 'json'))),
+ 'id' => $id,
'location_id' => $values_location[0]['id'], 'mode' => $mode, 'phpgw_return_as'
=> 'json'))),
'ColumnDefs' => $related_def,
'tabletools' => ($mode == 'edit') ?
$tabletools : array()
);
@@ -490,7 +501,7 @@
$datatable_def[] = array
(
'container' => 'datatable-container_1',
- 'requestUrl' =>
json_encode(self::link(array('menuaction' =>
'property.uigeneric_document.get_locations_for_type', 'id' => $id,
'phpgw_return_as' => 'json'))),
+ 'requestUrl' =>
json_encode(self::link(array('menuaction' =>
'property.uigeneric_document.get_locations_for_type', 'id' => $id, 'mode' =>
$mode, 'phpgw_return_as' => 'json'))),
'ColumnDefs' => $related_def2,
'tabletools' => ($mode == 'edit') ?
$tabletools2 : array()
);
@@ -531,6 +542,7 @@
}
phpgwapi_jquery::load_widget('numberformat');
+ phpgwapi_jquery::load_widget('autocomplete');
self::add_javascript('property', 'portico',
'generic_document.edit.js');
self::add_javascript('phpgwapi', 'tinybox2',
'packed.js');
@@ -687,6 +699,7 @@
$file_id = phpgw::get_var('id', 'int');
$location_id = phpgw::get_var('location_id', 'int');
$search = phpgw::get_var('search');
+ $mode = phpgw::get_var('mode');
$draw = phpgw::get_var('draw', 'int');
$only_related = phpgw::get_var('only_related',
'boolean');
@@ -717,8 +730,18 @@
$values = array();
foreach($_components as $item)
{
- $checked = in_array($item['id'],
$values_location_item_id) ? 'checked="checked"' : '';
+ if($mode == 'edit')
+ {
+ $checked = in_array($item['id'],
$values_location_item_id) ? ' checked="checked"' : '';
+ $relate = "<input value='{$item['id']}'
class='components mychecks' type='checkbox'{$checked}>";
+ }
+ else
+ {
+ $relate = in_array($item['id'],
$values_location_item_id) ? 'X' : '';
+ $checked = $relate;
+ }
+
if ($only_related && empty($checked))
{
continue;
@@ -727,7 +750,7 @@
$values[] = array(
'id' => '<a
href="'.self::link(array('menuaction' => 'property.uientity.view',
'location_id' => $location_id, 'id' => $item['id'])).'">'.$item['id'].'</a>',
'name' => $item['benevnelse'],
- 'relate' => '<input
value="'.$item['id'].'" class="components mychecks" type="checkbox"
'.$checked.'>',
+ 'relate' => $relate
);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16007] more on generic docs,
sigurdne <=