fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Marco Antonio Nina
2014-09-03 08:49:30 -04:00
parent 08c40a37b4 b920fdcd32
commit 558903b4dc
7 changed files with 416 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Rakefile
View File

@@ -226,6 +226,7 @@ def buildMafe(homeDir, targetDir, mode)
puts "\nCopying files into: #{mafeDir}".bold
copyFiles({
"#{homeDir}/lib/jQueryUI/images/*.png" => "#{cssTargetDir}/images/",
"#{homeDir}/build/js/designer.js" => "#{mafeDir}/designer.min.js",
"#{homeDir}/build/js/mafe.js" => "#{mafeDir}/mafe.min.js",
"#{homeDir}/build/css/mafe.css" => "#{mafeDir}/mafe.min.css",

23
rbac/engine/classes/model/Roles.php
View File

@@ -64,7 +64,7 @@ class Roles extends BaseRoles {
$this->setNew(false);
$this->getRolName();
$aFields['ROL_NAME'] = $this->rol_name;
$aFields['ROL_NAME'] = ($this->rol_name != '' ? $this->rol_name: $this->getRolCode());
return $aFields;
} else {
@@ -83,11 +83,14 @@ class Roles extends BaseRoles {
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
$aRow = $oDataset->getRow();
$roles = new Roles();
$roles->load($aRow['ROL_UID']);
$aRow['ROL_NAME'] = $roles->getRolName();
if ($aRow['ROL_NAME'] == '') {
$aRow['ROL_NAME'] = $roles->getRolCode();
}
if (is_array($aRow)) {
return $aRow;
} else {
@@ -159,16 +162,16 @@ class Roles extends BaseRoles {
$oCriteria->add(RolesPeer::ROL_CREATE_DATE, '', Criteria::NOT_EQUAL);
$oCriteria->add(RolesPeer::ROL_UPDATE_DATE, '', Criteria::NOT_EQUAL);
$oCriteria->addJoin(RolesPeer::ROL_SYSTEM, SystemsPeer::SYS_UID);
if ($filter != '') {
$oCriteria->add(RolesPeer::ROL_CODE, '%'.$filter.'%', Criteria::LIKE);
}
$oCriteria->setOffset($start);
$oCriteria->setLimit($limit);
$result['LIST'] = $oCriteria;
return $result;
}
@@ -183,6 +186,9 @@ class Roles extends BaseRoles {
$o = new Roles();
$o->load($row['ROL_UID']);
$row['ROL_NAME'] = $o->getRolName();
if ($row['ROL_NAME'] == '') {
$row['ROL_NAME'] = $o->getRolCode();
}
$aRows[] = $row;
}
return $aRows;
@@ -320,6 +326,9 @@ class Roles extends BaseRoles {
if (is_array($row)) {
$o = RolesPeer::retrieveByPK($row['ROL_UID']);
$row['ROL_NAME'] = $o->getRolName();
if ($row['ROL_NAME'] == '') {
$row['ROL_NAME'] = $o->getRolCode();
}
return $row;
} else {
return null;

60
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ProcessMaker 2.5.2.3\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2014-08-21 17:02:40\n"
"PO-Revision-Date: 2014-09-02 10:32:26\n"
"Last-Translator: \n"
"Language-Team: Colosa Developers Team <developers@colosa.com>\n"
"MIME-Version: 1.0\n"
@@ -12616,8 +12616,8 @@ msgstr "The current password is incorrect"
# TRANSLATION
# LABEL/ID_MAX_LIFETIME
#: LABEL/ID_MAX_LIFETIME
msgid "Maximum lifetime cleaned up (ms)"
msgstr "Maximum lifetime cleaned up (ms)"
msgid "Cookie lifetime (seconds)"
msgstr "Cookie lifetime (seconds)"
# TRANSLATION
# LABEL/ID_SUCCESSFUL_CONNECTION
@@ -13204,8 +13204,8 @@ msgstr "xxx"
# TRANSLATION
# LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5
#: LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP5
msgid "ProcessMaker uses a workspaces to store data. Please select a valid workspace name and credentials to log in it."
msgstr "ProcessMaker uses a workspaces to store data. Please select a valid workspace name and credentials to log in it."
msgid "ProcessMaker uses workspaces to store data. Please enter a valid workspace name and credentials to login."
msgstr "ProcessMaker uses workspaces to store data. Please enter a valid workspace name and credentials to login."
# TRANSLATION
# LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION_STEP4_2
@@ -13558,8 +13558,8 @@ msgstr "Pre-installation check"
# TRANSLATION
# LABEL/ID_DIRECTORY_FILE_PERMISSION
#: LABEL/ID_DIRECTORY_FILE_PERMISSION
msgid "Directory File Permission"
msgstr "Directory File Permission"
msgid "File Permisions"
msgstr "File Permisions"
# TRANSLATION
# LABEL/ID_DATA_CORRECT
@@ -16396,8 +16396,8 @@ msgstr "Use the language of URL"
# TRANSLATION
# LABEL/ID_SUMMARY_FORM_NO_PERMISSIONS
#: LABEL/ID_SUMMARY_FORM_NO_PERMISSIONS
msgid "You do not have permission to summary form"
msgstr "You do not have permission to summary form"
msgid "You do not have permission to have access to the summary form"
msgstr "You do not have permission to have access to the summary form"
# TRANSLATION
# LABEL/ID_SUMMARY_FORM
@@ -16411,6 +16411,48 @@ msgstr "Summary form"
msgid "You can't delete the default language."
msgstr "You can't delete the default language."
# TRANSLATION
# LABEL/ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT
#: LABEL/ID_UPLOAD_ERR_WRONG_ALLOWED_EXTENSION_FORMAT
msgid "The format is incorrect, check the following examples: *.* *.png *.pdf, *.doc, *.xls"
msgstr "The format is incorrect, check the following examples: *.* *.png *.pdf, *.doc, *.xls"
# TRANSLATION
# LABEL/ID_UPLOAD_ERR_NOT_ALLOWED_EXTENSION
#: LABEL/ID_UPLOAD_ERR_NOT_ALLOWED_EXTENSION
msgid "The file has not been attached because the extension is not allowed or because it doesn't correspond to the content of it."
msgstr "The file has not been attached because the extension is not allowed or because it doesn't correspond to the content of it."
# TRANSLATION
# LABEL/ID_INPUT_DOC_TYPE_FILE_REQUIRED
#: LABEL/ID_INPUT_DOC_TYPE_FILE_REQUIRED
msgid "You must specify the allowed file extensions, use *.* to allow any extension."
msgstr "You must specify the allowed file extensions, use *.* to allow any extension."
# TRANSLATION
# LABEL/ID_TINY_SYSTEM_VARIABLE
#: LABEL/ID_TINY_SYSTEM_VARIABLE
msgid "System Variable"
msgstr "System Variable"
# TRANSLATION
# LABEL/ID_CHOOSE_PROVIDER
#: LABEL/ID_CHOOSE_PROVIDER
msgid "Please select provider"
msgstr "Please select provider"
# TRANSLATION
# LABEL/ID_INDEX
#: LABEL/ID_INDEX
msgid "Index"
msgstr "Index"
# TRANSLATION
# LABEL/ID_ERROR_JS_NOT_AVAILABLE
#: LABEL/ID_ERROR_JS_NOT_AVAILABLE
msgid "Your browser does not support javascript or it is disabled, please use a different browser or activate the javascript. Forms won't work totally because javascript is used."
msgstr "Your browser does not support javascript or it is disabled, please use a different browser or activate the javascript. Forms won't work totally because javascript is used."
# additionalTables/additionalTablesData.xml?ADD_TAB_NAME
# additionalTables/additionalTablesData.xml
#: text - ADD_TAB_NAME

322
workflow/engine/data/mssql/insert.sql
View File

File diff suppressed because it is too large Load Diff

305
workflow/engine/data/mysql/insert.sql
View File

File diff suppressed because it is too large Load Diff

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

@@ -456,7 +456,7 @@ try {
}
$row['USR_ROLE_ID'] = $row['USR_ROLE'];
$row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['USR_ROLE']) : $uRole['USR_ROLE'];
$row['USR_ROLE'] = isset($uRole['ROL_NAME']) ? ($uRole['ROL_NAME'] != '' ? $uRole['ROL_NAME'] : $uRole['ROL_CODE']) : $uRole['ROL_CODE'];
$row['DUE_DATE_OK'] = (date('Y-m-d') > date('Y-m-d', strtotime($row['USR_DUE_DATE']))) ? 0 : 1;
$row['LAST_LOGIN'] = isset($aLogin[$row['USR_UID']]) ? $aLogin[$row['USR_UID']] : '';

7
workflow/engine/templates/cases/cases_Load.php
View File

@@ -18,9 +18,12 @@
document.documentElement.style.overflowY = 'hidden';
var oClientWinSize = getClientWindowSize();
if(document.compatMode == 'CSS1Compat' && document.documentMode == '10'){
document.documentElement.style.overflowY = 'scroll';
}
function autoResizeScreen() {
oCasesFrame = document.getElementById('casesFrame');
height = getClientWindowSize().height-90;