[Fmsystem-commits] [14818] check for stored item

[Sigurd Nes]

Revision: 14818
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14818
Author:   sigurdne
Date:     2016-03-08 09:50:51 +0000 (Tue, 08 Mar 2016)
Log Message:
-----------
check for stored item

Modified Paths:
--------------
    trunk/property/inc/class.uiproject.inc.php
    trunk/property/inc/class.uitts.inc.php
    trunk/property/inc/class.uiworkorder.inc.php
    trunk/property/js/portico/notify.js
    trunk/property/templates/base/project.xsl
    trunk/property/templates/base/tts.xsl
    trunk/property/templates/base/workorder.xsl

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2016-03-08 09:10:10 UTC (rev 
14817)
+++ trunk/property/inc/class.uiproject.inc.php  2016-03-08 09:50:51 UTC (rev 
14818)
@@ -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: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2016-03-08 09:10:10 UTC (rev 
14817)
+++ trunk/property/inc/class.uitts.inc.php      2016-03-08 09:50:51 UTC (rev 
14818)
@@ -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: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2016-03-08 09:10:10 UTC 
(rev 14817)
+++ trunk/property/inc/class.uiworkorder.inc.php        2016-03-08 09:50:51 UTC 
(rev 14818)
@@ -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: trunk/property/js/portico/notify.js
===================================================================
--- trunk/property/js/portico/notify.js 2016-03-08 09:10:10 UTC (rev 14817)
+++ trunk/property/js/portico/notify.js 2016-03-08 09:50:51 UTC (rev 14818)
@@ -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: trunk/property/templates/base/project.xsl
===================================================================
--- trunk/property/templates/base/project.xsl   2016-03-08 09:10:10 UTC (rev 
14817)
+++ trunk/property/templates/base/project.xsl   2016-03-08 09:50:51 UTC (rev 
14818)
@@ -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: trunk/property/templates/base/tts.xsl
===================================================================
--- trunk/property/templates/base/tts.xsl       2016-03-08 09:10:10 UTC (rev 
14817)
+++ trunk/property/templates/base/tts.xsl       2016-03-08 09:50:51 UTC (rev 
14818)
@@ -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: trunk/property/templates/base/workorder.xsl
===================================================================
--- trunk/property/templates/base/workorder.xsl 2016-03-08 09:10:10 UTC (rev 
14817)
+++ trunk/property/templates/base/workorder.xsl 2016-03-08 09:50:51 UTC (rev 
14818)
@@ -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">