Merge branch 'master' of http://git.roojs.com:8081/Pman.Core

[Pman.Core] / Pman.Lock.js

diff --git a/Pman.Lock.js b/Pman.Lock.js
index 96716bd..004a4b8 100644 (file)
--- 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,6 +46,7 @@ Roo.apply(Pman.Lock.prototype, {
     
     callLock : function(force)
     {
+        Roo.log('callLock');
         force = force || 0;
         var _t = this
         Pman.Request({
@@ -60,11 +62,12 @@ Roo.apply(Pman.Lock.prototype, {
             success : function(data)
             {
                 
-               // Roo.log(data);
+               Roo.log(data);
                 if (!force && typeof(data) == 'object') {
                     _t.confirmBreak(data);
+                    return;
                 }
-                _t.lock_id = data;
+                _t.id = data;
                 _t.cfg.success(_t); //dont care about scope..
                 
                 
@@ -79,7 +82,7 @@ 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) {
             if (r != 'yes') {
@@ -98,7 +101,7 @@ Roo.apply(Pman.Lock.prototype, {
         Pman.Request({
             url : baseURL + '/Core/Lock/unlock',
             params : {
-                id : this.lock_id
+                id : this.id
             },
             failure : function() {
                 Roo.MessageBox.alert("Error", "UnLock Request failed, you may get a warning when trying to edit again");