From 1ab0f541e507176d51a3ba780782757819d88e2f Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Tue, 16 Dec 2014 09:18:47 -0600
Subject: [PATCH] lock: Set ticket lock on ticket-view
Since the automatic lock was being acquired but not passed to the autoLock
system, the automatically acquired lock was not being release on away
navigation.
This patch addresses the issue by passing the automatically acquired lock id
to the autoLock system on ticket-view page load and change the ::Init()
method so that the lock id is not cleared with the ::Init() method is called
by the page load.
---
include/staff/ticket-view.inc.php | 7 +++++++
scp/js/ticket.js | 26 ++++++++++++++------------
2 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index 078af3a0a..aa13be276 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -989,5 +989,12 @@ $(function() {
}
});
});
+<?php
+ // Set the lock if one exists
+ if ($lock) { ?>
+ autoLock.setLock({
+ id:<?php echo $lock->getId(); ?>,
+ time: <?php echo $cfg->getLockTime(); ?>}, 'acquire');
+<?php } ?>
});
</script>
diff --git a/scp/js/ticket.js b/scp/js/ticket.js
index 2c9398a5a..fd6064aec 100644
--- a/scp/js/ticket.js
+++ b/scp/js/ticket.js
@@ -15,6 +15,20 @@
**********************************************************************/
var autoLock = {
+ // Defaults
+ lockId: 0,
+ timerId: 0,
+ lasteventTime: 0,
+ lastattemptTime: 0,
+ acquireTime: 0,
+ renewTime: 0,
+ renewFreq: 0, //renewal frequency in seconds...based on returned lock time.
+ time: 0,
+ lockAttempts: 0, //Consecutive lock attempt errors
+ maxattempts: 2, //Maximum failed lock attempts before giving up.
+ warn: true,
+ retry: true,
+
addEvent: function(elm, evType, fn, useCapture) {
if(elm.addEventListener) {
elm.addEventListener(evType, fn, useCapture);
@@ -111,18 +125,6 @@ var autoLock = {
void(autoLock.tid=parseInt($(':input[name=id]',fObj).val()));
void(autoLock.lockTime=parseInt($(':input[name=locktime]',fObj).val()));
- autoLock.lockId=0;
- autoLock.timerId=0;
- autoLock.lasteventTime=0;
- autoLock.lastattemptTime=0;
- autoLock.acquireTime=0;
- autoLock.renewTime=0;
- autoLock.renewFreq=0; //renewal frequency in seconds...based on returned lock time.
- autoLock.time=0;
- autoLock.lockAttempts=0; //Consecutive lock attempt errors
- autoLock.maxattempts=2; //Maximum failed lock attempts before giving up.
- autoLock.warn=true;
- autoLock.retry=true;
autoLock.watchDocument();
autoLock.resetTimer();
autoLock.addEvent(window,'unload',autoLock.releaseLock,true); //Release lock regardless of any activity.
--
GitLab