[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14819] Merge 14817:14818 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14819] Merge 14817:14818 from trunk |
|
Date: |
Tue, 08 Mar 2016 09:52:59 +0000 |
Revision: 14819
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14819
Author: sigurdne
Date: 2016-03-08 09:52:58 +0000 (Tue, 08 Mar 2016)
Log Message:
-----------
Merge 14817:14818 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
branches/Version-2_0-branch/property/inc/class.uitts.inc.php
branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
branches/Version-2_0-branch/property/js/portico/notify.js
branches/Version-2_0-branch/property/templates/base/project.xsl
branches/Version-2_0-branch/property/templates/base/tts.xsl
branches/Version-2_0-branch/property/templates/base/workorder.xsl
Property Changed:
----------------
branches/Version-2_0-branch/
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816
+ /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818
Modified: branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
2016-03-08 09:50:51 UTC (rev 14818)
+++ branches/Version-2_0-branch/property/inc/class.uiproject.inc.php
2016-03-08 09:52:58 UTC (rev 14819)
@@ -2108,7 +2108,7 @@
'value_approval_mail_address' =>
$supervisor_email,
'currency' =>
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
'base_java_url' =>
"{menuaction:'property.bocommon.get_vendor_email',phpgw_return_as:'json'}",
- 'base_java_notify_url' =>
"{menuaction:'property.notify.update_data',location_id:{$location_id},location_item_id:{$id}}",
+ 'location_item_id' => $id,
'edit_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uiproject.edit',
'id' => $id)),
'lang_edit_statustext' => lang('Edit this entry
'),
Modified: branches/Version-2_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2016-03-08 09:50:51 UTC (rev 14818)
+++ branches/Version-2_0-branch/property/inc/class.uitts.inc.php
2016-03-08 09:52:58 UTC (rev 14819)
@@ -2566,7 +2566,7 @@
'tabs' => self::_generate_tabs(true),
'td_count' => '""',
'base_java_url' =>
"{menuaction:'property.uitts.update_data',id:{$id}}",
- 'base_java_notify_url' =>
"{menuaction:'property.notify.update_data',location_id:{$location_id},location_item_id:'{$id}'}",
+ 'location_item_id' => $id,
'value_origin' => $ticket['origin'],
'value_target' => $ticket['target'],
'value_finnish_date' => $ticket['finnish_date'],
Modified: branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
2016-03-08 09:50:51 UTC (rev 14818)
+++ branches/Version-2_0-branch/property/inc/class.uiworkorder.inc.php
2016-03-08 09:52:58 UTC (rev 14819)
@@ -2337,7 +2337,7 @@
'lang_file_statustext' => lang('Select file to
upload'),
'value_billable_hours' =>
$values['billable_hours'],
'base_java_url' =>
"{menuaction:'property.bocommon.get_vendor_email',phpgw_return_as:'json'}",
- 'base_java_notify_url' =>
"{menuaction:'property.notify.update_data',location_id:{$location_id},location_item_id:'{$id}'}",
+ 'location_item_id' => $id,
'edit_action' =>
$GLOBALS['phpgw']->link('/index.php', array(
'menuaction' =>
'property.uiworkorder.edit',
'id' => $id)),
Modified: branches/Version-2_0-branch/property/js/portico/notify.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/notify.js 2016-03-08
09:50:51 UTC (rev 14818)
+++ branches/Version-2_0-branch/property/js/portico/notify.js 2016-03-08
09:52:58 UTC (rev 14819)
@@ -15,7 +15,7 @@
this.notify_contact_lookup = function ()
{
- if (!base_java_notify_url['location_item_id'])
+ if (!location_item_id)
{
alert(notify_lang_alert);
return;
Modified: branches/Version-2_0-branch/property/templates/base/project.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/project.xsl
2016-03-08 09:50:51 UTC (rev 14818)
+++ branches/Version-2_0-branch/property/templates/base/project.xsl
2016-03-08 09:52:58 UTC (rev 14819)
@@ -24,7 +24,7 @@
}
var project_type_id = '<xsl:value-of
select="project_type_id"/>';
var project_id = '<xsl:value-of select="value_project_id"/>';
- var base_java_notify_url = <xsl:value-of
select="base_java_notify_url"/>;
+ var location_item_id = '<xsl:value-of
select="location_item_id"/>';
var base_java_url = <xsl:value-of select="base_java_url"/>;
</script>
<xsl:choose>
Modified: branches/Version-2_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/tts.xsl 2016-03-08
09:50:51 UTC (rev 14818)
+++ branches/Version-2_0-branch/property/templates/base/tts.xsl 2016-03-08
09:52:58 UTC (rev 14819)
@@ -280,7 +280,7 @@
var my_groups = <xsl:value-of select="my_groups"/>;
var base_java_url = <xsl:value-of select="base_java_url"/>;
- var base_java_notify_url = <xsl:value-of
select="base_java_notify_url"/>;
+ var location_item_id = '<xsl:value-of
select="location_item_id"/>';
</script>
<dl>
Modified: branches/Version-2_0-branch/property/templates/base/workorder.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/workorder.xsl
2016-03-08 09:50:51 UTC (rev 14818)
+++ branches/Version-2_0-branch/property/templates/base/workorder.xsl
2016-03-08 09:52:58 UTC (rev 14819)
@@ -948,6 +948,7 @@
var lang = <xsl:value-of
select="php:function('js_lang', 'please enter either a budget or contrakt
sum')"/>;
var check_for_budget = <xsl:value-of
select="check_for_budget"/>;
var base_java_url = <xsl:value-of
select="base_java_url"/>;
+ var location_item_id = '<xsl:value-of
select="location_item_id"/>';
</script>
</div>
<div class="proplist-col">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14819] Merge 14817:14818 from trunk,
Sigurd Nes <=