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

Merge pull request #581 from julceslauhub/master

Browse Source 
Add some little validations in user edit screen and in the case messages list
This commit is contained in:
julceslauhub
2012-09-20 11:49:51 -07:00
parent 93cefd0701 adf104991c
commit 9cd7bdae2d
2 changed files with 146 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/methods/users/usersAjax.php
View File

@@ -55,7 +55,7 @@ switch($_POST['action'])
$oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME); $oCriteria->addSelectColumn(UsersPeer::USR_FIRSTNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME); $oCriteria->addSelectColumn(UsersPeer::USR_LASTNAME);
$oCriteria->addSelectColumn(UsersPeer::USR_EMAIL); $oCriteria->addSelectColumn(UsersPeer::USR_EMAIL);
$oCriteria->add(UsersPeer::USR_STATUS,'ACTIVE'); $oCriteria->add(UsersPeer::USR_STATUS, array('ACTIVE', 'VACATION'), Criteria::IN);
if (isset($_POST['USR_UID'])) { if (isset($_POST['USR_UID'])) {
$oCriteria->add(UsersPeer::USR_UID, $_POST['USR_UID'], Criteria::NOT_EQUAL); $oCriteria->add(UsersPeer::USR_UID, $_POST['USR_UID'], Criteria::NOT_EQUAL);
} }

3
workflow/engine/templates/cases/caseMessageHistory.js
View File

@@ -274,10 +274,9 @@ var ActionTabFrameGlobal = '';
//!!historyGridList|changeLog //!!historyGridList|changeLog
function caseMessageHistory_RSP(response,id){ function caseMessageHistory_RSP(response,id){
messageHistoryGridListMask.hide();
if(response==""){ if(response==""){
messageHistoryGridListMask.hide();
Ext.Msg.show({ Ext.Msg.show({
title:'', title:'',
msg: _('ID_MAIL_SENT_SUCCESSFULLY'), msg: _('ID_MAIL_SENT_SUCCESSFULLY'),