fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master' into BUG-9319

Browse Source
This commit is contained in:
Victor Saisa Lopez
2012-07-03 09:51:25 -04:00
parent e83a25ded8 cb6bd6bbf3
commit 186e18ea8d
2 changed files with 253 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gulliver/system/class.xmlform.php
View File

@@ -4569,6 +4569,7 @@ class xmlformTemplate extends Smarty
$result [$k] = G::replaceDataField ( $form->fields [$k]->label, $form->values ); $result [$k] = G::replaceDataField ( $form->fields [$k]->label, $form->values );
if (! is_array ( $value )) { if (! is_array ( $value )) {
if ($form->type == 'grid') { if ($form->type == 'grid') {
$therow = isset($form->values[$form->name]) ? count($form->values[$form->name]) : $therow;
$aAux = array (); $aAux = array ();
// $index = ($therow >count ( $form->owner->values [$form->name] ))? $therow : count($form->owner->values [$form->name] ); // $index = ($therow >count ( $form->owner->values [$form->name] ))? $therow : count($form->owner->values [$form->name] );
for($i = 0; $i < $therow; $i ++) { for($i = 0; $i < $therow; $i ++) {

28
workflow/engine/templates/users/users.js
View File

@@ -10,6 +10,7 @@ var infoMode;
var global = {}; var global = {};
var readMode; var readMode;
var usernameText; var usernameText;
var previousUsername = '';
var canEdit = true; var canEdit = true;
var flagPoliciesPassword = false; var flagPoliciesPassword = false;
var flagValidateUsername = false; var flagValidateUsername = false;
@@ -35,7 +36,7 @@ Ext.onReady(function() {
}); });
if (MODE == 'edit') if (MODE == 'edit' || MODE == '')
flagPoliciesPassword = true; flagPoliciesPassword = true;
//EDIT MODE //EDIT MODE
@@ -993,17 +994,26 @@ function validateUserName() {
function saveUser() function saveUser()
{ {
if (flagValidateUsername != true) { if (Ext.getCmp('USR_USERNAME').getValue() != '') {
validateUserName(); if (previousUsername != '') {
if ( Ext.getCmp('USR_USERNAME').getValue() == '') { if (Ext.getCmp('USR_USERNAME').getValue() != previousUsername) {
Ext.Msg.alert( _('ID_ERROR'), _('ID_MSG_ERROR_USR_USERNAME')); if (!flagValidateUsername) {
} else {
Ext.Msg.alert( _('ID_ERROR'), Ext.getCmp('usernameReview').html); Ext.Msg.alert( _('ID_ERROR'), Ext.getCmp('usernameReview').html);
return false;
} }
}
} else {
if (!flagValidateUsername) {
Ext.Msg.alert( _('ID_ERROR'), Ext.getCmp('usernameReview').html);
return false;
}
}
} else {
Ext.Msg.alert( _('ID_ERROR'), _('ID_MSG_ERROR_USR_USERNAME'));
return false; return false;
} }
if (flagPoliciesPassword != true) { if (!flagPoliciesPassword) {
if (Ext.getCmp('USR_NEW_PASS').getValue() == '') { if (Ext.getCmp('USR_NEW_PASS').getValue() == '') {
Ext.Msg.alert( _('ID_ERROR'), _('ID_PASSWD_REQUIRED')); Ext.Msg.alert( _('ID_ERROR'), _('ID_PASSWD_REQUIRED'));
} else { } else {
@@ -1131,6 +1141,8 @@ function loadUserData()
comboCalendar.setValue(data.user.USR_CALENDAR); comboCalendar.setValue(data.user.USR_CALENDAR);
}); });
previousUsername = Ext.getCmp('USR_USERNAME').getValue();
}, },
failure : function(r, o) { failure : function(r, o) {
@@ -1237,6 +1249,8 @@ function loadUserView()
//comboDefaultCasesMenuOption.setValue(''); //comboDefaultCasesMenuOption.setValue('');
comboDefaultCasesMenuOption.setValue(data.user.PREF_DEFAULT_CASES_MENUSELECTED); comboDefaultCasesMenuOption.setValue(data.user.PREF_DEFAULT_CASES_MENUSELECTED);
}); });
previousUsername = Ext.getCmp('USR_USERNAME').getValue();
}, },
failure:function(r,o) { failure:function(r,o) {
//viewport.getEl().unmask(); //viewport.getEl().unmask();