fernando/luos
1
0
Fork 0
Code Releases Activity

Add validation characters invalid

Browse Source
This commit is contained in:
Marco Antonio Nina Mena
2015-04-23 13:22:37 -04:00
parent 45bfffe71f
commit 0d11381fc7
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/src/ProcessMaker/BusinessModel/User.php
View File

@@ -363,7 +363,7 @@ class User
/*----------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
$this->getFieldNameByFormatFieldName("USR_COST_BY_HOUR") => $record["USR_COST_BY_HOUR"], $this->getFieldNameByFormatFieldName("USR_COST_BY_HOUR") => $record["USR_COST_BY_HOUR"],
$this->getFieldNameByFormatFieldName("USR_UNIT_COST") => $record["USR_UNIT_COST"], $this->getFieldNameByFormatFieldName("USR_UNIT_COST") => $record["USR_UNIT_COST"],
/*---------------------------------********---------------------------------*/ /*----------------------------------********---------------------------------*/
$this->getFieldNameByFormatFieldName("USR_TOTAL_INBOX") => $record["USR_TOTAL_INBOX"], $this->getFieldNameByFormatFieldName("USR_TOTAL_INBOX") => $record["USR_TOTAL_INBOX"],
$this->getFieldNameByFormatFieldName("USR_TOTAL_DRAFT") => $record["USR_TOTAL_DRAFT"], $this->getFieldNameByFormatFieldName("USR_TOTAL_DRAFT") => $record["USR_TOTAL_DRAFT"],
$this->getFieldNameByFormatFieldName("USR_TOTAL_CANCELLED") => $record["USR_TOTAL_CANCELLED"], $this->getFieldNameByFormatFieldName("USR_TOTAL_CANCELLED") => $record["USR_TOTAL_CANCELLED"],

23
workflow/engine/templates/strategicDashboard/formDashboard.js
View File

@@ -79,11 +79,13 @@ Ext.onReady( function() {
items : [ items : [
{ {
id : 'DAS_TITLE', id : 'DAS_TITLE',
fieldLabel : _('ID_DASHBOARD_TITLE'), fieldLabel : _('ID_DASHBOARD_TITLE')+ ' *',
xtype : 'textfield', xtype : 'textfield',
anchor : '85%', anchor : '85%',
maxLength : 250, maxLength : 250,
maskRe : /([a-zA-Z0-9\s]+)$/, maskRe : /([a-zA-Z0-9_'\s]+)$/,
regex : /([a-zA-Z0-9_'\s]+)$/,
regexText : _('ID_INVALID_VALUE', _('ID_DASHBOARD_TITLE')),
allowBlank : false allowBlank : false
}, },
{ {
@@ -92,7 +94,7 @@ Ext.onReady( function() {
fieldLabel : _('ID_DESCRIPTION'), fieldLabel : _('ID_DESCRIPTION'),
labelSeparator : '', labelSeparator : '',
anchor : '85%', anchor : '85%',
maskRe : /([a-zA-Z0-9\s]+)$/, maskRe : /([a-zA-Z0-9_'\s]+)$/,
height : 50, height : 50,
} }
] ]
@@ -671,7 +673,6 @@ Ext.onReady( function() {
] ]
}); });
ownerInfoGrid.store.load();
ownerInfoGrid.on("afterrender", function(component) { ownerInfoGrid.on("afterrender", function(component) {
component.getBottomToolbar().refresh.hideParent = true; component.getBottomToolbar().refresh.hideParent = true;
component.getBottomToolbar().refresh.hide(); component.getBottomToolbar().refresh.hide();
@@ -698,6 +699,7 @@ Ext.onReady( function() {
} }
dashboardOwnerFields.items.items[0].bindStore(dataUserGroup); dashboardOwnerFields.items.items[0].bindStore(dataUserGroup);
} ); } );
storeUsers.on( 'load', function( store, records, options ) { storeUsers.on( 'load', function( store, records, options ) {
for (var i=0; i< store.data.length; i++) { for (var i=0; i< store.data.length; i++) {
row = []; row = [];
@@ -751,11 +753,13 @@ var addTab = function (flag) {
hidden : true hidden : true
}, },
{ {
fieldLabel : _('ID_INDICATOR_TITLE'), fieldLabel : _('ID_INDICATOR_TITLE')+ ' *',
id : 'IND_TITLE_'+ indexTab, id : 'IND_TITLE_'+ indexTab,
xtype : 'textfield', xtype : 'textfield',
anchor : '85%', anchor : '85%',
maskRe : /([a-zA-Z0-9\s]+)$/, maskRe : /([a-zA-Z0-9_'\s]+)$/,
regex : /([a-zA-Z0-9_'\s]+)$/,
regexText : _('ID_INVALID_VALUE', _('ID_INDICATOR_TITLE')),
maxLength : 250, maxLength : 250,
allowBlank : false allowBlank : false
}, },
@@ -763,7 +767,7 @@ var addTab = function (flag) {
anchor : '85%', anchor : '85%',
editable : false, editable : false,
id : 'IND_TYPE_'+ indexTab, id : 'IND_TYPE_'+ indexTab,
fieldLabel : _('ID_INDICATOR_TYPE'), fieldLabel : _('ID_INDICATOR_TYPE')+ ' *',
displayField : 'CAT_LABEL_ID', displayField : 'CAT_LABEL_ID',
valueField : 'CAT_UID', valueField : 'CAT_UID',
forceSelection : false, forceSelection : false,
@@ -874,7 +878,7 @@ var addTab = function (flag) {
new Ext.form.ComboBox({ new Ext.form.ComboBox({
anchor : '85%', anchor : '85%',
editable : false, editable : false,
fieldLabel : _('ID_PROCESS'), fieldLabel : _('ID_PROCESS')+ ' *',
id : 'IND_PROCESS_'+ indexTab, id : 'IND_PROCESS_'+ indexTab,
displayField : 'prj_name', displayField : 'prj_name',
valueField : 'prj_uid', valueField : 'prj_uid',
@@ -1086,7 +1090,6 @@ var saveDashboard = function () {
}, },
data: JSON.stringify(data), data: JSON.stringify(data),
success: function (response) { success: function (response) {
var jsonResp = Ext.util.JSON.decode(response.responseText);
saveAllDashboardOwner(DAS_UID); saveAllDashboardOwner(DAS_UID);
saveAllIndicators(DAS_UID); saveAllIndicators(DAS_UID);
myMask.hide(); myMask.hide();
@@ -1113,7 +1116,7 @@ var saveAllIndicators = function (DAS_UID) {
fieldsTab.push(goal.items.items[0]); fieldsTab.push(goal.items.items[0]);
fieldsTab.push(goal.items.items[1]); fieldsTab.push(goal.items.items[1]);
data = []; var data = [];
data['DAS_UID'] = DAS_UID; data['DAS_UID'] = DAS_UID;
for (var index in fieldsTab) { for (var index in fieldsTab) {