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

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

Browse Source
This commit is contained in:
Hector Cortez
2013-04-22 12:54:28 -04:00
parent cc4cfd5b3d f046613e08
commit d173cdcd66
5 changed files with 63 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -532,12 +532,30 @@ class Configurations // extends Configuration
}
$langLocate = SYS_LANG;
if (SYS_LANG == 'es') {
$langLocate = 'es_ES';
} else if (strlen(SYS_LANG) > 2) {
$langLocate = str_replace('-', '_', SYS_LANG);
if (G::toLower(PHP_OS) == 'linux' || G::toLower(PHP_OS) == 'darwin') {
if (SYS_LANG == 'es') {
$langLocate = 'es_ES';
} else if (strlen(SYS_LANG) > 2) {
$langLocate = str_replace('-', '_', SYS_LANG);
} else {
$langLocate = 'en_US';
}
} else {
$langLocate = 'en_US';
switch (SYS_LANG) {
case 'es':
case 'es_ES':
$langLocate = 'ESN';
break;
case 'pt':
case 'pt-BR':
$langLocate = 'PTB';
break;
case 'en':
case 'en_US':
default:
$langLocate = 'EST';
break;
}
}
setlocale(LC_TIME, $langLocate);

34
workflow/engine/methods/setup/skin_Ajax.php
View File

@@ -45,25 +45,33 @@ function skinList ()
G::loadClass( 'system' );
$skinList = System::getSkingList();
$wildcard = '';
if (isset( $_REQUEST['activeskin'] )) {
$wildcard = '@';
}
$classicSkin = '';
if (defined('PARTNER_FLAG')) {
$classicSkin = '00000000000000000000000000000001';
}
foreach ($skinList['skins'] as $key => $value) {
if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs' && $value['SKIN_FOLDER_ID'] != 'uxmodern') {
if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) {
$value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' );
$value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME'];
$value['SKIN_WORKSPACE'] = $wildcard . $value['SKIN_WORKSPACE'];
$value['SKIN_DESCRIPTION'] = $wildcard . $value['SKIN_DESCRIPTION'];
$value['SKIN_AUTHOR'] = $wildcard . $value['SKIN_AUTHOR'];
$value['SKIN_CREATEDATE'] = $wildcard . $value['SKIN_CREATEDATE'];
$value['SKIN_MODIFIEDDATE'] = $wildcard . $value['SKIN_MODIFIEDDATE'];
} else {
$value['SKIN_STATUS'] = G::LoadTranslation( 'ID_INACTIVE' );
if ($value['SKIN_ID'] != $classicSkin) {
if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs' && $value['SKIN_FOLDER_ID'] != 'uxmodern') {
if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) {
$value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' );
$value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME'];
$value['SKIN_WORKSPACE'] = $wildcard . $value['SKIN_WORKSPACE'];
$value['SKIN_DESCRIPTION'] = $wildcard . $value['SKIN_DESCRIPTION'];
$value['SKIN_AUTHOR'] = $wildcard . $value['SKIN_AUTHOR'];
$value['SKIN_CREATEDATE'] = $wildcard . $value['SKIN_CREATEDATE'];
$value['SKIN_MODIFIEDDATE'] = $wildcard . $value['SKIN_MODIFIEDDATE'];
} else {
$value['SKIN_STATUS'] = G::LoadTranslation( 'ID_INACTIVE' );
}
$skinListArray['skins'][] = $value;
}
$skinListArray['skins'][] = $value;
}
}
$skinListArray['currentSkin'] = $skinList['currentSkin'];

11
workflow/engine/templates/pmTables/editReport.js
View File

@@ -910,7 +910,7 @@ function createReportTable()
{
var tableName = Ext.getCmp('REP_TAB_NAME').getValue().trim();
var tableDescription = Ext.getCmp('REP_TAB_DSC').getValue().trim();
//validate table name
if(Ext.getCmp('REP_TAB_NAME').getValue().trim() == '') {
Ext.getCmp('REP_TAB_NAME').focus();
@@ -919,6 +919,15 @@ function createReportTable()
});
return false;
}
//validate process
if(Ext.getCmp('PROCESS').getValue().trim() == '') {
Ext.getCmp('PROCESS').focus();
PMExt.error(_('ID_ERROR'), _('ID_PROCESS_IS_REQUIRED'), function(){
Ext.getCmp('PROCESS').focus();
});
return false;
}
// validate table name length
if(tableName.length < 4) {

9
workflow/engine/templates/setup/skinList.js
View File

@@ -132,7 +132,13 @@ Ext.onReady(function(){
rowSelected = infoGrid.getSelectionModel().getSelected();
if((rowSelected.data.SKIN_FOLDER_ID)&&((rowSelected.data.SKIN_FOLDER_ID!="classic"))){
exportButton.enable();
deleteButton.enable();
if (rowSelected.data.SKIN_STATUS!='Inactive') {
deleteButton.disable();
} else {
deleteButton.enable();
}
}else{
exportButton.disable();
deleteButton.disable();
@@ -363,6 +369,7 @@ showdate = function (value){
selectedSkin = function (value){
if(gotWildCard(value)){
deleteButton.disable();
return setBoldItalic(value.substring(1));
}
return value;

3
workflow/engine/templates/setup/systemInfo.js
View File

@@ -76,8 +76,7 @@ systemInfo.application = {
bodyStyle: "padding: 10px; font: 0.80em arial;",
width: 250,
height: 300,
html: _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION") + _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2")
html: _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION") +'<br><br>'+ _("ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2") +'<br><br>'+ _("ID_PROCESSMAKER_REQUIREMENTS_OPENSSL_OPTIONAL") +'<br><br>'+ _("ID_PROCESSMAKER_REQUIREMENTS_LDAP_OPTIONAL")
});
var frmfsCenter = new Ext.form.FieldSet({