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

PM-2104 Se visualiza una "," en el Loguot ,Administrador en el nuevo instalador de PM3-RC3

Browse Source 
Causa : Esta "," tal cual se indica aparece en esa poscion debido a que este obedece a una configuracion del ENVIRONMENT; ejemplo (@lastName, @firstName (@userName)), si esta seleccionada esta opcion deberia parecer una coma(,).
Solucion :  Sin embargo puede que algunos de estos valores (Firstname o lastanme fuese vacio) en este caso se elimina la coma ",".
This commit is contained in:
dheeyi
2015-04-15 16:28:01 -04:00
parent 4f8c4ee784
commit fb5759b7f5
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
workflow/engine/classes/class.configuration.php
View File

@@ -321,23 +321,14 @@ class Configurations // extends Configuration
$oUser = UsersPeer::retrieveByPK($usrUid);
$aux = str_replace('@userName', trim($username), $this->UserConfig['format']);
if(($aux === "@lastName @firstName" || $aux === "@lastName, @firstName") && strlen($oUser->getUsrFirstname())==0 && strlen($oUser->getUsrLastname())==0){
return $oUser->getUsrUsername();
$theFormat = $this->UserConfig['format'];
if (strpos($theFormat, ',') !== false && ($oUser->getUsrFirstname() == '' || $oUser->getUsrLastname() == '')) {
$theFormat = str_replace(',', '', $theFormat);
}
if (strlen($oUser->getUsrFirstname())!=0) {
$aux = str_replace('@firstName', $oUser->getUsrFirstname(), $aux);
}else{
$aux = str_replace('@firstName', "", $aux);
}
if (strlen($oUser->getUsrLastname())!=0) {
$aux = str_replace('@lastName', $oUser->getUsrLastname(), $aux);
}else{
$aux = str_replace('@lastName', "", $aux);
}
if (strlen(strstr($aux, ","))>0 && (strlen($oUser->getUsrFirstname())==0 || strlen($oUser->getUsrLastname())==0)) {
$aux = substr ($aux, ((strpos ($aux, ","))+1));
}
$aux = str_replace('@userName', trim($username), $theFormat);
$aux = str_replace('@firstName', $oUser->getUsrFirstname(), $aux);
$aux = str_replace('@lastName', $oUser->getUsrLastname(), $aux);
}
return $aux;
}