fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in gproly/processmaker (pull request #1405)

Browse Source 
PM-1437 PM-1396
This commit is contained in:
Julio Cesar Laura Avendaño
2015-02-06 16:20:48 -04:00
parent cd22e5a24a b2b2e8f47e
commit 5bbf9cbc14
1 changed files with 242 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
workflow/engine/templates/admin/calendarEdit.js
View File

@@ -751,32 +751,7 @@ Ext.onReady( function() {
width : 200 , width : 200 ,
fieldLabel : _('ID_NAME') , fieldLabel : _('ID_NAME') ,
name : 'name' , name : 'name' ,
allowBlank : false, allowBlank : false
listeners: {
change: function(){
Ext.getCmp('idInvalidCalendarName').hide();
var validateMessage = '';
var canlendarName = Ext.getCmp('dynaformCalendarName').getValue();
Ext.Ajax.request( {
url: '../adminProxy/calendarValidate',
params: {
action : 'calendarName',
oldName : fields.OLD_NAME,
name : canlendarName,
uid : fields.CALENDAR_UID
},
success: function(resp){
if (resp.responseText != '[]')
message = resp.responseText;
else
message = '';
}
});
},
focus: function(){
$message = '';
}
}
}, },
{ {
id : 'dynaformCalendarDescription' , id : 'dynaformCalendarDescription' ,
@@ -955,6 +930,27 @@ Ext.onReady( function() {
{ {
text: fields['NEWCALENDAR']=='YES'?_("ID_CREATE") : _("ID_UPDATE"), text: fields['NEWCALENDAR']=='YES'?_("ID_CREATE") : _("ID_UPDATE"),
handler: function() { handler: function() {
Ext.getCmp('idInvalidCalendarName').hide();
var canlendarName = Ext.getCmp('dynaformCalendarName').getValue().trim();
console.log(canlendarName);
if(canlendarName === ""){
Ext.getCmp('dynaformCalendarName').setValue("");
return;
}
Ext.Ajax.request({
url: '../adminProxy/calendarValidate',
params: {
action: 'calendarName',
oldName: fields.OLD_NAME,
name: canlendarName,
uid: fields.CALENDAR_UID
},
success: function (resp) {
if (resp.responseText != '[]')
message = resp.responseText;
else
message = '';
if(message!=''){ if(message!=''){
Ext.getCmp('idInvalidCalendarName').show(); Ext.getCmp('idInvalidCalendarName').show();
Ext.getCmp('dynaformCalendarName').focus(); Ext.getCmp('dynaformCalendarName').focus();
@@ -1177,32 +1173,9 @@ Ext.onReady( function() {
Ext.Msg.alert( _('ID_ERROR'), _('ID_MESSAGE_EMPTY_DATE_FIELD')); Ext.Msg.alert( _('ID_ERROR'), _('ID_MESSAGE_EMPTY_DATE_FIELD'));
} }
return true; return true;
},
listeners: {
mouseover: function () {
Ext.getCmp('idInvalidCalendarName').hide();
var validateMessage = '';
var canlendarName = Ext.getCmp('dynaformCalendarName').getValue();
var oldName = '';
if (name!='') {
oldName = '&oldName='+name;
}
Ext.Ajax.request( {
url: '../adminProxy/calendarValidate',
params: {
action : 'calendarName',
oldName : fields.OLD_NAME,
name : canlendarName,
uid : fields.CALENDAR_UID
},
success: function(resp){
if (resp.responseText != '[]')
message = resp.responseText;
else
message = '';
} }
}); });
} return true;
} }
}, },
{ {
@@ -1218,7 +1191,6 @@ Ext.onReady( function() {
] ]
}); });
//Ext.getCmp('idInvalidCalendarName').setVisible(false);
//[ DATA EDIT //[ DATA EDIT
calendarWorkDayStatusReset(); calendarWorkDayStatusReset();
var workDayEquivalenceArray = new Array(); var workDayEquivalenceArray = new Array();
@@ -1307,30 +1279,4 @@ Ext.onReady( function() {
dynaformCalendarName_.setValue(true); dynaformCalendarName_.setValue(true);
} }
//] //]
Ext.getCmp('idInvalidCalendarName').hide();
if (get != "edit") {
var validateMessage = '';
var canlendarName = Ext.getCmp('dynaformCalendarName').getValue();
var oldName = '';
if (name!='') {
oldName = '&oldName='+name;
}
Ext.Ajax.request( {
url: '../adminProxy/calendarValidate',
params: {
action : 'calendarName',
oldName : fields.OLD_NAME,
name : canlendarName
},
success: function(resp){
if (resp.responseText != '[]')
message = resp.responseText;
else
message = '';
}
});
}
}); });