From: Edward Date: Mon, 4 May 2015 05:51:14 +0000 (+0800) Subject: Pman.Dialog.CoreNotifyRecurKeywords.bjs X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=e49c1c8dfa7a0e4b02f500fd58bee46b7ecc9099 Pman.Dialog.CoreNotifyRecurKeywords.bjs Pman.Dialog.CoreNotifyRecurKeywords.js Pman.Dialog.CoreEnum.bjs Pman.Dialog.CoreEnum.js --- diff --git a/Pman.Dialog.CoreEnum.bjs b/Pman.Dialog.CoreEnum.bjs index 305714bd..9bb96afb 100644 --- a/Pman.Dialog.CoreEnum.bjs +++ b/Pman.Dialog.CoreEnum.bjs @@ -35,9 +35,9 @@ "* prop" : "center" }, { + "fitToFrame" : true, "background" : true, "region" : "center", - "fitToFrame" : true, "xtype" : "ContentPanel", "$ xns" : "Roo", "items" : [ @@ -47,8 +47,8 @@ "|rendered" : "function (form)\n{\n _this.form = form;\n}" }, "$ url" : "baseURL + '/Roo/core_enum.php'", - "xtype" : "Form", "method" : "POST", + "xtype" : "Form", "style" : "margin: 5px", "$ xns" : "Roo.form", "items" : [ diff --git a/Pman.Dialog.CoreNotifyRecurKeywords.bjs b/Pman.Dialog.CoreNotifyRecurKeywords.bjs index b0297350..b251baa9 100644 --- a/Pman.Dialog.CoreNotifyRecurKeywords.bjs +++ b/Pman.Dialog.CoreNotifyRecurKeywords.bjs @@ -41,7 +41,7 @@ "items" : [ { "listeners" : { - "|actioncomplete" : "function (_self, action)\n{\n if (action.type == 'setdata') {\n\n return;\n }\n if (action.type == 'load') {\n _this.dialog.el.unmask();\n return;\n }\n if (action.type == 'submit' ) {\n _this.dialog.el.unmask();\n _this.dialog.hide();\n\n if (_this.callback) {\n _this.callback.call(_this, action.result.data);\n }\n _this.form.reset();\n }\n}\n", + "|actioncomplete" : "function (_self, action)\n{\n if (action.type == 'setdata') {\n \n if(_this.data.id){\n _this.dialog.el.mask(\"Loading\");\n this.load({ method: 'GET', params: { '_id' : _this.data.id }}); \n }\n \n return;\n }\n if (action.type == 'load') {\n _this.dialog.el.unmask();\n return;\n }\n if (action.type == 'submit' ) {\n _this.dialog.el.unmask();\n _this.dialog.hide();\n\n if (_this.callback) {\n _this.callback.call(_this, action.result.data);\n }\n _this.form.reset();\n }\n}\n", "|rendered" : "function (form)\n{\n _this.form = form;\n}" }, "$ url" : "baseURL + '/Roo/Core_notify_recur.php'", diff --git a/Pman.Dialog.CoreNotifyRecurKeywords.js b/Pman.Dialog.CoreNotifyRecurKeywords.js index 468b12ba..7beb28f3 100644 --- a/Pman.Dialog.CoreNotifyRecurKeywords.js +++ b/Pman.Dialog.CoreNotifyRecurKeywords.js @@ -114,8 +114,13 @@ Pman.Dialog.CoreNotifyRecurKeywords = { actioncomplete : function (_self, action) { if (action.type == 'setdata') { - - return; + + if(_this.data.id){ + _this.dialog.el.mask("Loading"); + this.load({ method: 'GET', params: { '_id' : _this.data.id }}); + } + + return; } if (action.type == 'load') { _this.dialog.el.unmask();