[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17025] more on location exceptions
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17025] more on location exceptions |
|
Date: |
Fri, 1 Sep 2017 09:36:43 -0400 (EDT) |
Revision: 17025
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17025
Author: sigurdne
Date: 2017-09-01 09:36:43 -0400 (Fri, 01 Sep 2017)
Log Message:
-----------
more on location exceptions
Modified Paths:
--------------
trunk/property/inc/class.bogeneric.inc.php
trunk/property/inc/class.sogeneric.inc.php
trunk/property/inc/class.uilocation.inc.php
trunk/property/js/portico/project.edit.js
trunk/property/js/portico/tts.add.js
trunk/property/js/portico/tts.view.js
trunk/property/js/portico/workorder.edit.js
Modified: trunk/property/inc/class.bogeneric.inc.php
===================================================================
--- trunk/property/inc/class.bogeneric.inc.php 2017-09-01 13:04:02 UTC (rev
17024)
+++ trunk/property/inc/class.bogeneric.inc.php 2017-09-01 13:36:43 UTC (rev
17025)
@@ -167,7 +167,7 @@
{
$entry[$field['name']]
= $GLOBALS['phpgw']->accounts->get($entry[$field['name']])->__toString();
}
- else if (isset($field['role'])
&& $field['role'] == 'parent' &&
!empty($field['values_def']['method_input']['type']))
+ else if ((isset($field['role'])
&& $field['role'] == 'parent' ||
isset($field['values_def']['method_input']['role']) &&
$field['values_def']['method_input']['role'] == 'parent') &&
!empty($field['values_def']['method_input']['type']))
{
$path =
$this->so->get_path(array('type' =>
$field['values_def']['method_input']['type'], 'id' => $entry[$field['name']]));
$entry[$field['name']]
= implode(' > ', $path);
Modified: trunk/property/inc/class.sogeneric.inc.php
===================================================================
--- trunk/property/inc/class.sogeneric.inc.php 2017-09-01 13:04:02 UTC (rev
17024)
+++ trunk/property/inc/class.sogeneric.inc.php 2017-09-01 13:36:43 UTC (rev
17025)
@@ -2614,7 +2614,6 @@
'nullable' =>
false,
'filter' =>
true,
'sortable' =>
true,
- 'role' =>
'parent',
'values_def' =>
array
(
'valueset' => false,
Modified: trunk/property/inc/class.uilocation.inc.php
===================================================================
--- trunk/property/inc/class.uilocation.inc.php 2017-09-01 13:04:02 UTC (rev
17024)
+++ trunk/property/inc/class.uilocation.inc.php 2017-09-01 13:36:43 UTC (rev
17025)
@@ -1006,15 +1006,15 @@
$function_exchange_values .=<<<JS
- parent.JqueryPortico.onPopupClose("close");
-
try
{
-
parent.on_location_updated(aData["location_code"]);
+ //
parent.on_location_updated(aData["location_code"]);
+
window.parent.on_location_updated(aData["location_code"]);
}
catch(err)
{}
+ parent.JqueryPortico.onPopupClose("close");
});
});
Modified: trunk/property/js/portico/project.edit.js
===================================================================
--- trunk/property/js/portico/project.edit.js 2017-09-01 13:04:02 UTC (rev
17024)
+++ trunk/property/js/portico/project.edit.js 2017-09-01 13:36:43 UTC (rev
17025)
@@ -397,7 +397,7 @@
JqueryPortico.autocompleteHelper(strURL, 'b_account_name', 'b_account_id',
'b_account_container');
-on_location_updated = function ()
+window.on_location_updated = function ()
{
if( $("#delivery_address").val() )
{
Modified: trunk/property/js/portico/tts.add.js
===================================================================
--- trunk/property/js/portico/tts.add.js 2017-09-01 13:04:02 UTC (rev
17024)
+++ trunk/property/js/portico/tts.add.js 2017-09-01 13:36:43 UTC (rev
17025)
@@ -77,7 +77,7 @@
errorMessageKey: ''
});
-on_location_updated = function (location_code)
+window.on_location_updated = function (location_code)
{
location_code = location_code || $("#loc1").val();
Modified: trunk/property/js/portico/tts.view.js
===================================================================
--- trunk/property/js/portico/tts.view.js 2017-09-01 13:04:02 UTC (rev
17024)
+++ trunk/property/js/portico/tts.view.js 2017-09-01 13:36:43 UTC (rev
17025)
@@ -543,44 +543,42 @@
});
}
- on_location_updated = function (location_code)
- {
- location_code = location_code || $("#loc1").val();
+ on_location_updated(location_code);
- var oArgs = {menuaction:
'property.uilocation.get_location_exception', location_code: location_code};
- var requestUrl = phpGWLink('index.php', oArgs, true);
+});
- $.ajax({
- type: 'POST',
- dataType: 'json',
- url: requestUrl,
- success: function (data)
+window.on_location_updated = function (location_code)
+{
+ location_code = location_code || $("#loc1").val();
+
+ var oArgs = {menuaction: 'property.uilocation.get_location_exception',
location_code: location_code};
+ var requestUrl = phpGWLink('index.php', oArgs, true);
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: requestUrl,
+ success: function (data)
+ {
+ $("#message").html('');
+
+ if (data != null)
{
- $("#message").html('');
-
- if (data != null)
+ var htmlString = '';
+ var exceptions = data.location_exception;
+ $.each(exceptions, function (k, v)
{
- var htmlString = '';
- var exceptions =
data.location_exception;
- $.each(exceptions, function (k, v)
+ htmlString += "<div
class=\"msg_good\">";
+ htmlString += v.severity + ": " +
v.category_text;
+ if (v.location_descr)
{
- htmlString += "<div
class=\"msg_good\">";
- htmlString += v.severity + ": "
+ v.category_text;
- if (v.location_descr)
- {
- htmlString += "<br/>" +
v.location_descr;
- }
- htmlString += '</div>';
+ htmlString += "<br/>" +
v.location_descr;
+ }
+ htmlString += '</div>';
- });
- $("#message").html(htmlString);
- }
+ });
+ $("#message").html(htmlString);
}
- });
- };
-
-
- on_location_updated(location_code);
-
-});
-
+ }
+ });
+};
Modified: trunk/property/js/portico/workorder.edit.js
===================================================================
--- trunk/property/js/portico/workorder.edit.js 2017-09-01 13:04:02 UTC (rev
17024)
+++ trunk/property/js/portico/workorder.edit.js 2017-09-01 13:36:43 UTC (rev
17025)
@@ -660,7 +660,7 @@
});
}
-on_location_updated = function ()
+window.on_location_updated = function ()
{
if( $("#delivery_address").val() )
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17025] more on location exceptions,
sigurdne <=