projects
/
Pman.Admin
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sync
[Pman.Admin]
/
Pman.Dialog.AdminWatch.js
diff --git
a/Pman.Dialog.AdminWatch.js
b/Pman.Dialog.AdminWatch.js
index
547446e
..
f98c5c3
100644
(file)
--- a/
Pman.Dialog.AdminWatch.js
+++ b/
Pman.Dialog.AdminWatch.js
@@
-33,6
+33,7
@@
Pman.Dialog.AdminWatch = {
closable : false,
collapsible : false,
height : 230,
closable : false,
collapsible : false,
height : 230,
+ modal : true,
resizable : false,
title : "Edit / Create core_watch",
width : 500,
resizable : false,
title : "Edit / Create core_watch",
width : 500,
@@
-118,7
+119,7
@@
Pman.Dialog.AdminWatch = {
{
o.params = o.params || {};
// staff can see all logs, other companies can only see their own.
{
o.params = o.params || {};
// staff can see all logs, other companies can only see their own.
- if (Pman.Login.authUser.company_id_comptype != 'OWNER') {
+ if (
(typeof(Pman.Login) != 'undefined') &&
Pman.Login.authUser.company_id_comptype != 'OWNER') {
o.params.company_id = Pman.Login.authUser.company_id;
}
o.params._distinct = 'on_table';
o.params.company_id = Pman.Login.authUser.company_id;
}
o.params._distinct = 'on_table';
@@
-270,7
+271,7
@@
Pman.Dialog.AdminWatch = {
fieldLabel : 'Notify Who',
forceSelection : true,
hiddenName : 'person_id',
fieldLabel : 'Notify Who',
forceSelection : true,
hiddenName : 'person_id',
- listWidth :
4
00,
+ listWidth :
5
00,
loadingText : "Searching...",
minChars : 2,
name : 'person_id_name',
loadingText : "Searching...",
minChars : 2,
name : 'person_id_name',
@@
-278,7
+279,7
@@
Pman.Dialog.AdminWatch = {
qtip : "Select Person",
queryParam : 'query[name]',
selectOnFocus : true,
qtip : "Select Person",
queryParam : 'query[name]',
selectOnFocus : true,
- tpl : '<div class="x-grid-cell-text x-btn button"><b>{name}</b> </div>',
+ tpl : '<div class="x-grid-cell-text x-btn button"><b>{name}</b>
({company_id_name}) <{email}>
</div>',
triggerAction : 'all',
typeAhead : true,
valueField : 'id',
triggerAction : 'all',
typeAhead : true,
valueField : 'id',
@@
-286,19
+287,19
@@
Pman.Dialog.AdminWatch = {
store : {
xtype: 'Store',
xns: Roo.data,
store : {
xtype: 'Store',
xns: Roo.data,
- remoteSort : true,
- sortInfo : { direction : 'ASC', field: 'id' },
listeners : {
beforeload : function (_self, o){
o.params = o.params || {};
// set more here
}
},
listeners : {
beforeload : function (_self, o){
o.params = o.params || {};
// set more here
}
},
+ remoteSort : true,
+ sortInfo : { direction : 'ASC', field: 'name' },
proxy : {
xtype: 'HttpProxy',
xns: Roo.data,
method : 'GET',
proxy : {
xtype: 'HttpProxy',
xns: Roo.data,
method : 'GET',
- url : baseURL + '/Roo/
Person.php
'
+ url : baseURL + '/Roo/
core_person
'
},
reader : {
xtype: 'JsonReader',
},
reader : {
xtype: 'JsonReader',
@@
-326,7
+327,6
@@
Pman.Dialog.AdminWatch = {
allowBlank : true,
displayField : 'action',
editable : true,
allowBlank : true,
displayField : 'action',
editable : true,
- emptyText : "Select Action",
fieldLabel : 'Match Event',
forceSelection : false,
listWidth : 300,
fieldLabel : 'Match Event',
forceSelection : false,
listWidth : 300,
@@
-350,7
+350,7
@@
Pman.Dialog.AdminWatch = {
{
o.params = o.params || {};
// staff can see all logs, other companies can only see their own.
{
o.params = o.params || {};
// staff can see all logs, other companies can only see their own.
- if (Pman.Login.authUser.company_id_comptype != 'OWNER') {
+ if (
typeof(Pman.Login) !='undefined' &&
Pman.Login.authUser.company_id_comptype != 'OWNER') {
o.params.company_id = Pman.Login.authUser.company_id;
}
o.params._distinct = 'action';
o.params.company_id = Pman.Login.authUser.company_id;
}
o.params._distinct = 'action';
@@
-490,8
+490,9
@@
Pman.Dialog.AdminWatch = {
xns: Roo.form,
allowBlank : true,
displayField : 'val',
xns: Roo.form,
allowBlank : true,
displayField : 'val',
- editable :
fals
e,
+ editable :
tru
e,
fieldLabel : 'Action',
fieldLabel : 'Action',
+ forceSelection : false,
listWidth : 200,
name : 'medium',
triggerAction : 'all',
listWidth : 200,
name : 'medium',
triggerAction : 'all',
@@
-500,7
+501,7
@@
Pman.Dialog.AdminWatch = {
store : {
xtype: 'SimpleStore',
xns: Roo.data,
store : {
xtype: 'SimpleStore',
xns: Roo.data,
- data : [ [ 'email' ], [ 'APPROVAL' ] ],
+ data : [ [ 'email' ], [ 'APPROVAL' ]
, ['ENDOFDAYMAIL']
],
fields : [ 'val' ]
}
},
fields : [ 'val' ]
}
},
@@
-545,7
+546,7
@@
Pman.Dialog.AdminWatch = {
// do some checks?
// do some checks?
- _this.dialog.el.mask("Saving");
+
_this.form.doAction("submit");
}
_this.form.doAction("submit");
}