X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Lock.js;h=b44696d717e5f89f2c10f4586ba3846ee5859d79;hp=8496dba2cb39574a8726c22f22b1ac138739a01a;hb=c1af5e6bb6064e88469651271f4d9aaff34d69c0;hpb=da73cb6c1941439989f4391c511fa9b514001348

diff --git a/Pman.Lock.js b/Pman.Lock.js
index 8496dba2..b44696d7 100644
--- a/Pman.Lock.js
+++ b/Pman.Lock.js
@@ -35,18 +35,22 @@
  */
 Pman.Lock = function (cfg) {
     this.cfg = cfg;
+    Roo.log('ctor-callLock');
     this.callLock();
 }
 
 Roo.apply(Pman.Lock.prototype, {
     cfg : false,
     
+    id : false, // the id of the lock..
+    
     callLock : function(force)
     {
+        Roo.log('callLock');
         force = force || 0;
-        var _t = this
-        Pman.Request({
-            url : baseURL + 'Core/Lock/lock',
+        var _t = this;
+        new Pman.Request({
+            url : baseURL + '/Core/Lock/lock',
             params : {
                 on_table : this.cfg.table,
                 on_id : this.cfg.id,
@@ -55,14 +59,15 @@ 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;
                 }
-                
+                _t.id = data;
                 _t.cfg.success(_t); //dont care about scope..
                 
                 
@@ -77,9 +82,9 @@ Roo.apply(Pman.Lock.prototype, {
             
         Roo.each(ar, function(p) {
             msg += '<br/>' + p.name + ' at ' + p.lock_created ;
-        })
+        });
         var _t = this;
-        Roo.messageBox.confirm("Confirm breaking locks", msg, function(r) {
+        Roo.MessageBox.confirm("Confirm breaking locks", msg, function(r) {
             if (r != 'yes') {
                 return;
             }
@@ -93,24 +98,17 @@ Roo.apply(Pman.Lock.prototype, {
     
     
     unlock : function() {
-        Pman.Request({
-            url : baseURL + 'Core/Lock/unlock',
+        new Pman.Request({
+            url : baseURL + '/Core/Lock/unlock',
             params : {
-                id : this.lock_id
+                id : this.id
             },
             failure : function() {
-                Roo.MessageBox.alert("Error", "Lock Request failed, please try again");
+                Roo.MessageBox.alert("Error", "UnLock Request failed, you may get a warning when trying to edit again");
             },
             success : function(data)
             {
-                Roo.log(data);
-                
-                if (typeof(data) == 'object') {
-                    _t.confirmBreak(data);
-                }
-                
-                _t.cfg.success(_t); //dont care about scope..
-                
+                // don nothing
                 
             }
         });