[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13806] property: test for valid session in project a
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [13806] property: test for valid session in project and workorder |
|
Date: |
Sat, 29 Aug 2015 16:55:49 +0000 |
Revision: 13806
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13806
Author: sigurdne
Date: 2015-08-29 16:55:48 +0000 (Sat, 29 Aug 2015)
Log Message:
-----------
property: test for valid session in project and workorder
Modified Paths:
--------------
trunk/property/templates/base/project.xsl
trunk/property/templates/base/workorder.xsl
Modified: trunk/property/templates/base/project.xsl
===================================================================
--- trunk/property/templates/base/project.xsl 2015-08-29 00:34:14 UTC (rev
13805)
+++ trunk/property/templates/base/project.xsl 2015-08-29 16:55:48 UTC (rev
13806)
@@ -48,6 +48,42 @@
document.form.tab.value = tab;
}
</script>
+ <script type="text/javascript">
+ $(document).ready(function(){
+ $('form[name=form]').submit(function(e) {
+ e.preventDefault();
+
+ var oArgs =
{menuaction:'property.bocommon.confirm_session'};
+ var strURL = phpGWLink('index.php', oArgs,
true);
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: strURL,
+ success: function(data) {
+ if( data != null)
+ {
+
if(data['sessionExpired'] == true)
+ {
+
window.alert('sessionExpired - please log in');
+
lightboxlogin();//defined i phpgwapi/templates/portico/js/base.js
+ }
+ else
+ {
+
document.form.submit();
+ }
+ }
+ },
+ failure: function(o)
+ {
+ window.alert('failure - try
again - once');
+ },
+ timeout: 5000
+ });
+
+ });
+ });
+ </script>
<table cellpadding="2" cellspacing="2" align="center">
<xsl:choose>
<xsl:when test="msgbox_data != ''">
Modified: trunk/property/templates/base/workorder.xsl
===================================================================
--- trunk/property/templates/base/workorder.xsl 2015-08-29 00:34:14 UTC (rev
13805)
+++ trunk/property/templates/base/workorder.xsl 2015-08-29 16:55:48 UTC (rev
13806)
@@ -80,16 +80,68 @@
<script type="text/javascript">
+
+ function check_valid_session()
+ {
+ var oArgs =
{menuaction:'property.bocommon.confirm_session'};
+ var strURL = phpGWLink('index.php', oArgs,
true);
+
+ $.ajax({
+ type: 'POST',
+ dataType: 'json',
+ url: strURL,
+ success: function(data) {
+ if( data != null)
+ {
+
if(data['sessionExpired'] == true)
+ {
+
window.alert('sessionExpired - please log in');
+
lightboxlogin();//defined i phpgwapi/templates/portico/js/base.js
+ }
+ else
+ {
+
document.form.submit();
+ }
+ }
+ },
+ failure: function(o)
+ {
+ window.alert('failure - try
again - once');
+ },
+ timeout: 5000
+ });
+ }
+
+ function submit_workorder()
+ {
+ check_valid_session();
+ }
+
function calculate_workorder()
{
document.getElementsByName("calculate_workorder")[0].value = 1;
- document.form.submit();
+ check_valid_session();
}
function send_workorder()
{
document.getElementsByName("send_workorder")[0].value = 1;
- document.form.submit();
+ check_valid_session();
}
+
+ $(document).ready(function()
+ {
+ $('form[name=form]').submit(function(e) {
+
+ var lean = <xsl:value-of
select="lean"/>;
+ if (lean == 0)
+ {
+ e.preventDefault();
+ check_valid_session();
+ }
+ });
+ });
+
+
function set_tab(tab)
{
document.form.tab.value = tab;
@@ -115,7 +167,7 @@
<table>
<tr height="50">
<td>
- <input
type="button" name="save" value="{$lang_save}"
onClick="document.form.submit();">
+ <input
type="button" name="save" value="{$lang_save}" onClick="submit_workorder();">
<xsl:attribute name="title">
<xsl:value-of select="lang_save_statustext"/>
</xsl:attribute>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13806] property: test for valid session in project and workorder,
Sigurd Nes <=