[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15221] Syncromind: merge 15217:15220 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15221] Syncromind: merge 15217:15220 from trunk |
|
Date: |
Mon, 30 May 2016 12:09:11 +0000 (UTC) |
Revision: 15221
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15221
Author: sigurdne
Date: 2016-05-30 12:09:11 +0000 (Mon, 30 May 2016)
Log Message:
-----------
Syncromind: merge 15217:15220 from trunk
Modified Paths:
--------------
branches/dev-syncromind-2/property/inc/class.uientity.inc.php
branches/dev-syncromind-2/property/inc/class.uiworkorder.inc.php
branches/dev-syncromind-2/property/js/portico/entity.edit.js
branches/dev-syncromind-2/property/templates/base/config.tpl
branches/dev-syncromind-2/property/templates/base/workorder.xsl
Property Changed:
----------------
branches/dev-syncromind-2/
Property changes on: branches/dev-syncromind-2
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14934-14935,15165-15215
+ /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14934-14935,15165-15215,15218-15220
Modified: branches/dev-syncromind-2/property/inc/class.uientity.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uientity.inc.php
2016-05-30 12:06:28 UTC (rev 15220)
+++ branches/dev-syncromind-2/property/inc/class.uientity.inc.php
2016-05-30 12:09:11 UTC (rev 15221)
@@ -558,7 +558,7 @@
return $values;
}
- $location_id =
$GLOBALS['phpgw']->locations->get_id('property', $this->acl_location);
+ $location_id =
$GLOBALS['phpgw']->locations->get_id($this->type_app[$this->type],
$this->acl_location);
$custom_config = CreateObject('admin.soconfig',
$location_id);
$_config = isset($custom_config->config_data) &&
$custom_config->config_data ? $custom_config->config_data : array();
@@ -863,7 +863,7 @@
*/
function get_target()
{
- $id = phpgw::get_var('id', 'REQUEST', 'int');
+ $id = phpgw::get_var('id', 'int');
$draw = phpgw::get_var('draw', 'int');
$allrows = phpgw::get_var('length', 'int') == -1;
@@ -976,6 +976,7 @@
$allrows = phpgw::get_var('length', 'int') == -1;
$values = $this->bo->read_single(array('entity_id' =>
$this->entity_id, 'cat_id' => $this->cat_id,
+ 'type' => $this->type,
'id' => $id));
$link_file_data = array
@@ -2008,7 +2009,7 @@
(
'container' => 'datatable-container_0',
'requestUrl' =>
json_encode(self::link(array('menuaction' => 'property.uientity.get_files',
- 'entity_id' =>
$this->entity_id, 'cat_id' => $this->cat_id, 'id' => $id, 'phpgw_return_as' =>
'json'))),
+ 'entity_id' =>
$this->entity_id, 'cat_id' => $this->cat_id, 'id' => $id, 'type' =>
$this->type, 'phpgw_return_as' => 'json'))),
'ColumnDefs' => $file_def,
'config' => array(
array('disableFilter' => true),
@@ -2040,7 +2041,13 @@
(
'container' => 'datatable-container_1',
'requestUrl' =>
json_encode(self::link(array('menuaction' => 'property.uientity.get_target',
- 'id' => $id,
'phpgw_return_as' => 'json'))),
+ 'entity_id' => $this->entity_id,
+ 'cat_id' => $this->cat_id,
+ 'id' => $id,
+ 'type' => $this->type,
+ 'phpgw_return_as' => 'json')
+ )
+ ),
'ColumnDefs' => $target_def,
'config' => array(
array('disableFilter' => true),
@@ -2104,9 +2111,9 @@
)
);
//}
+ $location_id =
$GLOBALS['phpgw']->locations->get_id($this->type_app[$this->type],
$this->acl_location);
if ($_enable_controller)
{
- $location_id =
$GLOBALS['phpgw']->locations->get_id('property', $this->acl_location);
$_controls =
$this->get_controls_at_component($location_id, $id);
$controls_def = array
Modified: branches/dev-syncromind-2/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uiworkorder.inc.php
2016-05-30 12:06:28 UTC (rev 15220)
+++ branches/dev-syncromind-2/property/inc/class.uiworkorder.inc.php
2016-05-30 12:09:11 UTC (rev 15221)
@@ -2195,8 +2195,9 @@
$unspsc_code = $values['unspsc_code'] ?
$values['unspsc_code'] :
$GLOBALS['phpgw_info']['user']['preferences']['property']['unspsc_code'];
- $data = array
- (
+ $enable_unspsc =
isset($config->config_data['enable_unspsc']) &&
$config->config_data['enable_unspsc'] ? true : false;
+ $enable_order_service_id =
isset($config->config_data['enable_order_service_id']) &&
$config->config_data['enable_order_service_id'] ? true : false;
+ $data = array(
'datatable_def' => $datatable_def,
'periodization_data' => $periodization_data,
'year_list' => array(
@@ -2208,6 +2209,8 @@
'lang_claim' => lang('claim'),
'suppressmeter' =>
isset($config->config_data['project_suppressmeter']) &&
$config->config_data['project_suppressmeter'] ? 1 : '',
'suppresscoordination' => $suppresscoordination,
+ 'enable_unspsc' => $enable_unspsc,
+ 'enable_order_service_id' =>
$enable_order_service_id,
'tabs' => self::_generate_tabs(array(),
$active_tab, array(
'documents' => $id ? false : true,
'history' => $id ? false : true)),
Modified: branches/dev-syncromind-2/property/js/portico/entity.edit.js
===================================================================
--- branches/dev-syncromind-2/property/js/portico/entity.edit.js
2016-05-30 12:06:28 UTC (rev 15220)
+++ branches/dev-syncromind-2/property/js/portico/entity.edit.js
2016-05-30 12:09:11 UTC (rev 15221)
@@ -225,8 +225,14 @@
{
$('#doc_type').change( function()
{
- oTable7.dataTableSettings[7]['ajax']['data']['doc_type'] =
$(this).val();
- oTable7.fnDraw();
+ var oTable = $("#datatable-container_7").dataTable();
+ var api = oTable.api();
+ var requestUrl = api.ajax.url();
+ Url = JqueryPortico.parseURL(requestUrl);
+ oArgs = Url.searchObject;
+ oArgs.doc_type = $(this).val();
+ requestUrl = phpGWLink('index.php', oArgs, true);
+ api.ajax.url(requestUrl).load();
});
$("#workorder_cancel").on("submit", function (e)
Modified: branches/dev-syncromind-2/property/templates/base/config.tpl
===================================================================
--- branches/dev-syncromind-2/property/templates/base/config.tpl
2016-05-30 12:06:28 UTC (rev 15220)
+++ branches/dev-syncromind-2/property/templates/base/config.tpl
2016-05-30 12:09:11 UTC (rev 15221)
@@ -189,9 +189,25 @@
</select>
</td>
</tr>
-
-
<tr class="pure-table-odd">
+ <td>{lang_enable_UNSPSC_kode}:</td>
+ <td>
+ <select name="newsettings[enable_unspsc]">
+ <option value=""
{selected_enable_unspsc_}>NO</option>
+ <option value="1"
{selected_enable_unspsc_1}>YES</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>{lang_enable_order_service_id}:</td>
+ <td>
+ <select
name="newsettings[enable_order_service_id]">
+ <option value=""
{selected_enable_order_service_id_}>NO</option>
+ <option value="1"
{selected_enable_order_service_id_1}>YES</option>
+ </select>
+ </td>
+ </tr>
+ <tr class="pure-table-odd">
<td>{lang_Default_municipal_number}:</td>
<td><input name="newsettings[default_municipal]"
value="{value_default_municipal}"></td>
</tr>
Modified: branches/dev-syncromind-2/property/templates/base/workorder.xsl
===================================================================
--- branches/dev-syncromind-2/property/templates/base/workorder.xsl
2016-05-30 12:06:28 UTC (rev 15220)
+++ branches/dev-syncromind-2/property/templates/base/workorder.xsl
2016-05-30 12:09:11 UTC (rev 15221)
@@ -564,34 +564,36 @@
</xsl:if>
</input>
</div>
+ <xsl:if test="enable_order_service_id =
1">
+ <div class="pure-control-group">
+ <xsl:variable
name="lang_service">
+ <xsl:value-of
select="php:function('lang', 'service')"/>
+ </xsl:variable>
+ <label>
+ <xsl:value-of
select="$lang_service"/>
+ </label>
+ <input type="hidden"
id="service_id" name="values[service_id]" value="{value_service_id}"/>
+ <input type="text"
id="service_name" name="values[service_name]" value="{value_service_name}">
+ <xsl:choose>
+
<xsl:when test="mode='edit'">
+
<!--xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="$lang_service"/>
+
</xsl:attribute-->
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:attribute name="disabled">
+
<xsl:text>disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:otherwise>
+ </xsl:choose>
+ </input>
+ <div
id="service_container"/>
+ </div>
+ </xsl:if>
<div class="pure-control-group">
- <xsl:variable
name="lang_service">
- <xsl:value-of
select="php:function('lang', 'service')"/>
- </xsl:variable>
- <label>
- <xsl:value-of
select="$lang_service"/>
- </label>
- <input type="hidden"
id="service_id" name="values[service_id]" value="{value_service_id}"/>
- <input type="text"
id="service_name" name="values[service_name]" value="{value_service_name}">
- <xsl:choose>
- <xsl:when
test="mode='edit'">
-
<!--xsl:attribute name="data-validation">
-
<xsl:text>required</xsl:text>
-
</xsl:attribute>
-
<xsl:attribute name="data-validation-error-msg">
-
<xsl:value-of select="$lang_service"/>
-
</xsl:attribute-->
- </xsl:when>
- <xsl:otherwise>
-
<xsl:attribute name="disabled">
-
<xsl:text>disabled</xsl:text>
-
</xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- </input>
- <div id="service_container"/>
- </div>
- <div class="pure-control-group">
<xsl:variable name="lang_dimb">
<xsl:value-of
select="php:function('lang', 'dimb')"/>
</xsl:variable>
@@ -654,34 +656,35 @@
</input>
<div id="b_account_container"/>
</div>
- <!--xsl:call-template
name="b_account_form"/-->
- <div class="pure-control-group">
- <xsl:variable
name="lang_unspsc_code">
- <xsl:value-of
select="php:function('lang', 'unspsc code')"/>
- </xsl:variable>
- <label>
- <xsl:value-of
select="$lang_unspsc_code"/>
- </label>
- <input type="hidden"
id="unspsc_code" name="values[unspsc_code]" value="{value_unspsc_code}"/>
- <input type="text"
id="unspsc_code_name" name="values[unspsc_code_name]"
value="{value_unspsc_code} {value_unspsc_code_name}">
- <xsl:choose>
- <xsl:when
test="mode='edit'">
-
<!--xsl:attribute name="data-validation">
-
<xsl:text>required</xsl:text>
-
</xsl:attribute>
-
<xsl:attribute name="data-validation-error-msg">
-
<xsl:value-of select="$lang_unspsc_code"/>
-
</xsl:attribute-->
- </xsl:when>
- <xsl:otherwise>
-
<xsl:attribute name="disabled">
-
<xsl:text>disabled</xsl:text>
-
</xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- </input>
- <div
id="unspsc_code_container"/>
- </div>
+ <xsl:if test="enable_unspsc = 1">
+ <div class="pure-control-group">
+ <xsl:variable
name="lang_unspsc_code">
+ <xsl:value-of
select="php:function('lang', 'unspsc code')"/>
+ </xsl:variable>
+ <label>
+ <xsl:value-of
select="$lang_unspsc_code"/>
+ </label>
+ <input type="hidden"
id="unspsc_code" name="values[unspsc_code]" value="{value_unspsc_code}"/>
+ <input type="text"
id="unspsc_code_name" name="values[unspsc_code_name]"
value="{value_unspsc_code} {value_unspsc_code_name}">
+ <xsl:choose>
+
<xsl:when test="mode='edit'">
+
<!--xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="$lang_unspsc_code"/>
+
</xsl:attribute-->
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:attribute name="disabled">
+
<xsl:text>disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:otherwise>
+ </xsl:choose>
+ </input>
+ <div
id="unspsc_code_container"/>
+ </div>
+ </xsl:if>
<xsl:choose>
<xsl:when
test="collect_building_part=1">
<div
class="pure-control-group">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15221] Syncromind: merge 15217:15220 from trunk,
sigurdne <=