From e085a3505ffcaa255d83146b3edf0426b195b071 Mon Sep 17 00:00:00 2001 From: edward Date: Thu, 15 Feb 2018 11:59:15 +0800 Subject: [PATCH] Pman.Dialog.VerifyAccess.bjs Pman.Dialog.VerifyAccess.js --- Pman.Dialog.VerifyAccess.bjs | 52 +++++------------ Pman.Dialog.VerifyAccess.js | 106 +++++++++-------------------------- 2 files changed, 42 insertions(+), 116 deletions(-) diff --git a/Pman.Dialog.VerifyAccess.bjs b/Pman.Dialog.VerifyAccess.bjs index c2cca074..5ba6d9cf 100644 --- a/Pman.Dialog.VerifyAccess.bjs +++ b/Pman.Dialog.VerifyAccess.bjs @@ -8,7 +8,6 @@ "strings" : { "e2c9d024b79dfb48b42a7807206c6aed" : "Verify New IP Access", "d41d8cd98f00b204e9800998ecf8427e" : "", - "7c5ba892645af8d7dba520e3978c726f" : "Director", "f6039d44b29456b20f8f373155ae4973" : "Username", "dfb790522fdea3859af206d32916fe77" : "User Agent", "d71940f24ee38ee09f6e06b908480bcf" : "Resend email", @@ -95,49 +94,26 @@ "$ xns" : "Roo.bootstrap", "items" : [ { - "Boolean allowBlank" : false, - "String name" : "_existing_director_name", - "Number minChars" : 2, - "Number md" : 12, - "String valueField" : "id", - "String queryParam" : "query[name]", - "Boolean typeAhead" : true, + "listeners" : { + "render" : "function (_self)\n{\n _this.status_filter = _self;\n}", + "select" : "function (combo, record, index)\n{\n _this.table.footer.onClick('first'); \n}" + }, + "String name" : "status_filter_name", + "String mode" : "local", + "String valueField" : "code", + "Boolean editable" : false, "xtype" : "ComboBox", "String triggerAction" : "all", - "Boolean editable" : true, - "Boolean alwaysQuery" : true, "$ xns" : "Roo.bootstrap", - "String/Roo.Template tpl" : "
{fullname}
", - "String fieldLabel" : "Director", - "String hiddenName" : "_existing_director", - "String displayField" : "fullname", - "Boolean forceSelection" : true, - "String indicatorpos" : "right", + "String hiddenName" : "status_filter", + "String displayField" : "value", "items" : [ { - "listeners" : { - "beforeload" : "function (_self, o)\n{\n o.params = o.params || {};\n \n o.params._with_fullname = 1;\n \n var parent = _this.form.findField('parent_company_id').getValue() * 1;\n \n o.params._hide_existing = 1;\n \n o.params._parent_company_id = parent;\n \n if (Roo.select('main').first().dom.className.indexOf('trust') >= 0) {\n \n o.params._find_person_type = 'trustee';\n }\n \n}" - }, - "xtype" : "Store", - "boolean remoteSort" : true, + "$ string data" : "[\n ['all', 'All'],\n ['submitted', 'Submitted'],\n ['pending_submission', 'Pending Submission'],\n ['pending_approval', 'Pending Approval'],\n ['rejected', 'Rejected'],\n ['approved', 'Approved'],\n ['deleted', 'Deleted']\n] ", + "xtype" : "SimpleStore", "$ xns" : "Roo.data", - "$ sortInfo" : "{field:\"firstname\",direction:\"ASC\"}", - "* prop" : "store", - "items" : [ - { - "xtype" : "HttpProxy", - "$ xns" : "Roo.data", - "String method" : "GET", - "* prop" : "proxy", - "$ String url" : "baseURL+'/Roo/Coba_person'" - }, - { - "xtype" : "JsonReader", - "$ xns" : "Roo.data", - "$ fields" : "[\n {\n 'name': 'id',\n 'type': 'int'\n },\n {\n 'name': 'honor',\n 'type': 'string'\n },\n {\n 'name': 'firstname',\n 'type': 'string'\n },\n {\n 'name': 'middlename',\n 'type': 'string'\n },\n {\n 'name': 'lastname',\n 'type': 'string'\n },\n {\n 'name': 'fullname',\n 'type': 'string'\n }\n]", - "* prop" : "reader" - } - ] + "$ fields" : "[ 'code', 'value' ]", + "* prop" : "store" } ] } diff --git a/Pman.Dialog.VerifyAccess.js b/Pman.Dialog.VerifyAccess.js index a39fa818..b3e79175 100644 --- a/Pman.Dialog.VerifyAccess.js +++ b/Pman.Dialog.VerifyAccess.js @@ -10,7 +10,6 @@ Roo.apply(Pman.Dialog.VerifyAccess.prototype, { _strings : { 'e2c9d024b79dfb48b42a7807206c6aed' :"Verify New IP Access", 'd41d8cd98f00b204e9800998ecf8427e' :"", - '7c5ba892645af8d7dba520e3978c726f' :"Director", 'f6039d44b29456b20f8f373155ae4973' :"Username", 'dfb790522fdea3859af206d32916fe77' :"User Agent", 'd71940f24ee38ee09f6e06b908480bcf' :"Resend email", @@ -288,88 +287,39 @@ Roo.apply(Pman.Dialog.VerifyAccess.prototype, { items : [ { xtype : 'ComboBox', - allowBlank : false, - alwaysQuery : true, - displayField : 'fullname', - editable : true, - fieldLabel : _this._strings['7c5ba892645af8d7dba520e3978c726f'] /* Director */, - forceSelection : true, - hiddenName : '_existing_director', - indicatorpos : 'right', - md : 12, - minChars : 2, - name : '_existing_director_name', - queryParam : 'query[name]', - tpl : '
{fullname}
', + displayField : 'value', + editable : false, + hiddenName : 'status_filter', + mode : 'local', + name : 'status_filter_name', triggerAction : 'all', - typeAhead : true, - valueField : 'id', + valueField : 'code', + listeners : { + render : function (_self) + { + _this.status_filter = _self; + }, + select : function (combo, record, index) + { + _this.table.footer.onClick('first'); + } + }, xns : Roo.bootstrap, '|xns' : 'Roo.bootstrap', store : { - xtype : 'Store', - remoteSort : true, - sortInfo : {field:"firstname",direction:"ASC"}, - listeners : { - beforeload : function (_self, o) - { - o.params = o.params || {}; - - o.params._with_fullname = 1; - - var parent = _this.form.findField('parent_company_id').getValue() * 1; - - o.params._hide_existing = 1; - - o.params._parent_company_id = parent; - - if (Roo.select('main').first().dom.className.indexOf('trust') >= 0) { - - o.params._find_person_type = 'trustee'; - } - - } - }, + xtype : 'SimpleStore', + data : [ + ['all', 'All'], + ['submitted', 'Submitted'], + ['pending_submission', 'Pending Submission'], + ['pending_approval', 'Pending Approval'], + ['rejected', 'Rejected'], + ['approved', 'Approved'], + ['deleted', 'Deleted'] + ], + fields : [ 'code', 'value' ], xns : Roo.data, - '|xns' : 'Roo.data', - proxy : { - xtype : 'HttpProxy', - method : 'GET', - url : baseURL+'/Roo/Coba_person', - xns : Roo.data, - '|xns' : 'Roo.data' - }, - reader : { - xtype : 'JsonReader', - fields : [ - { - 'name': 'id', - 'type': 'int' - }, - { - 'name': 'honor', - 'type': 'string' - }, - { - 'name': 'firstname', - 'type': 'string' - }, - { - 'name': 'middlename', - 'type': 'string' - }, - { - 'name': 'lastname', - 'type': 'string' - }, - { - 'name': 'fullname', - 'type': 'string' - } - ], - xns : Roo.data, - '|xns' : 'Roo.data' - } + '|xns' : 'Roo.data' } } ] -- 2.39.2