From f5a857b75961694069112df3dfc6f0d8006aaeac Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 13 Sep 2012 11:14:57 +0800 Subject: [PATCH] Pman.Tab.AdminContactsGroup.bjs Pman.Tab.AdminContactsGroup.js --- Pman.Tab.AdminContactsGroup.bjs | 6 +++--- Pman.Tab.AdminContactsGroup.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Pman.Tab.AdminContactsGroup.bjs b/Pman.Tab.AdminContactsGroup.bjs index 77f15f2..0803ad1 100644 --- a/Pman.Tab.AdminContactsGroup.bjs +++ b/Pman.Tab.AdminContactsGroup.bjs @@ -1,9 +1,9 @@ { - "id": "roo-file-92", + "id": "roo-file-145", "name": "Pman.Tab.AdminContactsGroup", "parent": "Pman.Tab.AdminContactsManager", "title": "Pman.Tab.AdminContactsGroup", - "path": "/home/chris/gitlive/Pman.Admin/Pman.Tab.AdminContactsGroup.bjs", + "path": "/home/alan/gitlive/Pman.Admin/Pman.Tab.AdminContactsGroup.bjs", "items": [ { "listeners": { @@ -143,7 +143,7 @@ }, { "listeners": { - "drop": "function (source, e, data)\n{\n // Roo.log(\"DROP\");\n var t = Roo.lib.Event.getTarget(e); \n var ri = _this.grid.view.findRowIndex(t);\n var rid = false;\n if (ri !== false) {\n rid = _this.grid.getDataSource().getAt(ri).data;\n }\n var s = _this.grid.getSelectionModel().getSelections();\n \n //console.log(data);\n var isFromGroup = s.length ? s[0].data.id > 0 : false;\n\n var isToGroup = rid && rid.id > 0;\n this.success = false;\n if (isFromGroup && isToGroup) {\n return;\n }\n if (!isFromGroup && !isToGroup) {\n return;\n }\n var action = 'add';\n if (isFromGroup && !isToGroup) {\n action = 'sub';\n //return 'x-dd-drop-ok-sub'; \n }\n // build a list of selections.\n var sels = [];\n for (var i=0; i < data.selections.length; i++) {\n sels.push(data.selections[i].data.id);\n }\n\n Pman.request({\n url: baseURL + '/Core/GroupMembers.php',\n params: {\n action : action,\n group_id: action =='add' ? rid.id : s[0].data.id,\n type: _this.type,\n user_ids : sels.join(',')\n \n }, \n method: 'POST', \n success : function(data) {\n //refreshPager();\n // \n // do we need to do anything??\n if (isFromGroup) {\n Pman.Tab.AdminContacts.grid.footer.onClick('refresh');\n }\n }, \n \n failure: function() {\n //Ext.get(document.body).unmask();\n //if (cb) {\n // cb.call(false);\n //}\n \n }\n });\n\n this.success = true;\n\n //if (!isFromGroup && isToGroup) {\n //return 'x-dd-drop-ok-add'; \n return;\n //}\n}", + "drop": "function (source, e, data)\n{\n // Roo.log(\"DROP\");\n var t = Roo.lib.Event.getTarget(e); \n var ri = _this.grid.view.findRowIndex(t);\n var rid = false;\n if (ri !== false) {\n rid = _this.grid.getDataSource().getAt(ri).data;\n }\n var s = _this.grid.getSelectionModel().getSelections();\n \n //console.log(data);\n var isFromGroup = s.length ? s[0].data.id > 0 : false;\n\n var isToGroup = rid && rid.id > 0;\n this.success = false;\n if (isFromGroup && isToGroup) {\n return;\n }\n if (!isFromGroup && !isToGroup) {\n return;\n }\n var action = 'add';\n if (isFromGroup && !isToGroup) {\n action = 'sub';\n //return 'x-dd-drop-ok-sub'; \n }\n // build a list of selections.\n var sels = [];\n for (var i=0; i < data.selections.length; i++) {\n sels.push(data.selections[i].data.id);\n }\n\n new Pman.Request({\n url: baseURL + '/Core/GroupMembers.php',\n params: {\n action : action,\n group_id: action =='add' ? rid.id : s[0].data.id,\n type: _this.type,\n user_ids : sels.join(',')\n \n }, \n method: 'POST', \n success : function(res) {\n var data = res.data\n //refreshPager();\n // \n // do we need to do anything??\n if (isFromGroup) {\n Pman.Tab.AdminContacts.grid.footer.onClick('refresh');\n }\n }, \n \n failure: function() {\n //Ext.get(document.body).unmask();\n //if (cb) {\n // cb.call(false);\n //}\n \n }\n });\n\n this.success = true;\n\n //if (!isFromGroup && isToGroup) {\n //return 'x-dd-drop-ok-add'; \n return;\n //}\n}", "over": "function (source, e, data)\n{\n // Roo.log(\"dragover\");\n \n //Roo.log(e);\n var t = Roo.lib.Event.getTarget(e); \n // Roo.log(t);\n var ri = _this.grid.view.findRowIndex(t);\n // Roo.log(ri);\n \n var rid = false;\n if (ri !== false) {\n rid = _this.grid.getDataSource().getAt(ri).data;\n }\n \n var s = _this.grid.getSelectionModel().getSelections();\n \n var isFromGroup = s.length ? s[0].data.id > 0 : false;\n \n var isToGroup = rid && rid.id > 0;\n \n// Roo.log(\"isToGroup:\" + isToGroup + \", isFromGroup\" + isFromGroup);\n \n if (isFromGroup && isToGroup) {\n this.valid = false;\n// Roo.log('not valid');\n return;\n }\n if (!isFromGroup && !isToGroup) {\n this.valid = false;\n// Roo.log('not valid');\n return \n }\n if (isFromGroup && !isToGroup) {\n this.valid = 'ok-sub'; \n return;\n } \n //if (!isFromGroup && isToGroup) {\n this.valid = 'ok-add';\n// Roo.log('add'); \n //}\n}" }, "*prop": "dropTarget", diff --git a/Pman.Tab.AdminContactsGroup.js b/Pman.Tab.AdminContactsGroup.js index 6605e39..30126b9 100644 --- a/Pman.Tab.AdminContactsGroup.js +++ b/Pman.Tab.AdminContactsGroup.js @@ -351,7 +351,7 @@ Pman.Tab.AdminContactsGroup = new Roo.XComponent({ }, method: 'POST', success : function(res) { - var data = res.data; + var data = res.data //refreshPager(); // // do we need to do anything?? -- 2.39.2