X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Lock.js;h=9636ada9b685aa3e8005488f9879dd835bff7eb5;hp=c773c11afb45edafed70e9411e64ec8bd673a893;hb=HEAD;hpb=70e233f7b5590f895bfb65639953e7d5212a2c51 diff --git a/Pman.Lock.js b/Pman.Lock.js index c773c11a..9636ada9 100644 --- a/Pman.Lock.js +++ b/Pman.Lock.js @@ -35,6 +35,7 @@ */ Pman.Lock = function (cfg) { this.cfg = cfg; + Roo.log('ctor-callLock'); this.callLock(); } @@ -45,9 +46,10 @@ Roo.apply(Pman.Lock.prototype, { callLock : function(force) { + Roo.log('callLock'); force = force || 0; - var _t = this - Pman.Request({ + var _t = this; + new Pman.Request({ url : baseURL + '/Core/Lock/lock', params : { on_table : this.cfg.table, @@ -57,10 +59,10 @@ Roo.apply(Pman.Lock.prototype, { failure : function() { Roo.MessageBox.alert("Error", "Lock Request failed, please try again"); }, - success : function(data) + success : function(res) { - - // Roo.log(data); + var data = res.data; + Roo.log(data); if (!force && typeof(data) == 'object') { _t.confirmBreak(data); return; @@ -80,7 +82,7 @@ Roo.apply(Pman.Lock.prototype, { Roo.each(ar, function(p) { msg += '
' + p.name + ' at ' + p.lock_created ; - }) + }); var _t = this; Roo.MessageBox.confirm("Confirm breaking locks", msg, function(r) { if (r != 'yes') { @@ -95,11 +97,12 @@ Roo.apply(Pman.Lock.prototype, { }, - unlock : function() { - Pman.Request({ + unlock : function(id) { + id = id || this.id; + new Pman.Request({ url : baseURL + '/Core/Lock/unlock', params : { - id : this.id + id : id }, failure : function() { Roo.MessageBox.alert("Error", "UnLock Request failed, you may get a warning when trying to edit again");