From 8c4bf869a7e677317a6d7a00b0b809eb6e50040f Mon Sep 17 00:00:00 2001 From: Vera Osokina Date: Tue, 16 Apr 2013 17:22:01 -0400 Subject: [PATCH 1/6] BUG 11272 Processmaker don't have to let edit UserName and Role. Now Processmaker don't let edit UserName and Role since a different Administrator role. --- workflow/engine/methods/users/usersEdit.php | 3 ++- workflow/engine/methods/users/usersInit.php | 1 + workflow/engine/templates/users/users.js | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/workflow/engine/methods/users/usersEdit.php b/workflow/engine/methods/users/usersEdit.php index bbfd6b575..80985013e 100644 --- a/workflow/engine/methods/users/usersEdit.php +++ b/workflow/engine/methods/users/usersEdit.php @@ -1 +1,2 @@ -addExtJsScript( 'users/users', true ); //adding a javascript file .js $oHeadPublisher->assign( 'USR_UID', $_GET['USR_UID'] ); $oHeadPublisher->assign( 'MODE', $_GET['MODE'] ); $oHeadPublisher->assign( 'MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ' ); G::RenderPage( 'publish', 'extJs' ); \ No newline at end of file +load( $_SESSION['USER_LOGGED'] ); $mul = substr( $POST_MAX_SIZE, - 1 ); $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1))); $postMaxSize = (int) $POST_MAX_SIZE * $mul; $UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' ); $mul = substr( $UPLOAD_MAX_SIZE, - 1 ); $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1))); $uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul; if ($postMaxSize < $uploadMaxSize) $uploadMaxSize = $postMaxSize; $oHeadPublisher = & headPublisher::getSingleton(); $oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js $oHeadPublisher->assign( 'USR_UID', $_GET['USR_UID'] ); $oHeadPublisher->assign( 'ROLE', $aFields['USR_ROLE']); $oHeadPublisher->assign( 'MODE', $_GET['MODE'] ); $oHeadPublisher->assign( 'MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ' ); G::RenderPage( 'publish', 'extJs' ); \ No newline at end of file diff --git a/workflow/engine/methods/users/usersInit.php b/workflow/engine/methods/users/usersInit.php index 54aec877d..a1282e4dd 100644 --- a/workflow/engine/methods/users/usersInit.php +++ b/workflow/engine/methods/users/usersInit.php @@ -30,6 +30,7 @@ $oHeadPublisher = & headPublisher::getSingleton(); $oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js // $oHeadPublisher->addContent('users/users'); //adding a html file .html. $oHeadPublisher->assign( 'USR_UID', $aFields['USR_UID'] ); +$oHeadPublisher->assign( 'ROLE', $aFields['USR_ROLE']); $oHeadPublisher->assign( 'infoMode', true ); $oHeadPublisher->assign( 'EDITPROFILE', 1); $oHeadPublisher->assign( 'canEdit', $canEdit ); diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js index 7ebc5ef20..b1f0d5a33 100644 --- a/workflow/engine/templates/users/users.js +++ b/workflow/engine/templates/users/users.js @@ -394,6 +394,7 @@ Ext.onReady(function () { selectOnFocus : true, editable : false, allowBlank : false, + hidden : (typeof(ROLE) != "undefined" && ROLE == "PROCESSMAKER_ADMIN")? false : true, triggerAction : 'all', mode : 'local' }); @@ -421,6 +422,8 @@ Ext.onReady(function () { xtype : 'textfield', width : 260, allowBlank : false, + hidden : (typeof EDITPROFILE != "undefined" && EDITPROFILE == 1)? true : false, + hidden : (typeof(ROLE) != "undefined" && ROLE == "PROCESSMAKER_ADMIN")? false : true, listeners: { blur : function(ob) { From 67ae008a2d425a053033009e98822582002a84ce Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Wed, 17 Apr 2013 11:43:20 -0400 Subject: [PATCH 2/6] DOC SYSTEM Cambio del instalador para cambiar la url de redireccion Cambio del instalador para cambiar la url de redireccion --- workflow/engine/controllers/installer.php | 38 ++++++++++++++--------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index 9eaefd320..a07e9ae76 100644 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -822,26 +822,36 @@ class Installer extends Controller G::loadClass( 'system' ); $envFile = PATH_CONFIG . 'env.ini'; - //writting for new installtions to use the classic skin - $updatedConf['default_skin'] = 'classic'; - $info->uri = '/sys' . $_REQUEST['workspace'] . '/en/classic/login/login'; - - try { - G::update_php_ini( $envFile, $updatedConf ); - } catch (Exception $e) { - $info->result = false; - $info->message = G::LoadTranslation('ID_PROCESSMAKER_WRITE_CONFIG_INDEX', SYS_LANG, Array($envFile)); - $info->message .= G::LoadTranslation('ID_PROCESSMAKER_UI_NOT_INSTALL'); - $this->installLog( G::LoadTranslation('ID_INSTALL_BUT_ERROR', SYS_LANG, Array('env.ini'))); - return $info; - } - // getting configuration from env.ini $sysConf = System::getSystemConfiguration( $envFile ); + $langUri = 'en'; + if (isset($sysConf['default_lang'])) { + $langUri = $sysConf['default_lang']; + } + + $skinUri = 'classic'; + if (isset($sysConf['default_skin'])) { + $skinUri = $sysConf['default_skin']; + } + + $updatedConf['default_lang'] = $langUri; + $updatedConf['default_skin'] = $skinUri; + $info->uri = PATH_SEP . 'sys' . $_REQUEST['workspace'] . PATH_SEP . $langUri . PATH_SEP . $skinUri . PATH_SEP . 'login' . PATH_SEP . 'login'; + if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) { $this->buildParternExtras($adminUsername, $adminPassword, $_REQUEST['workspace'], SYS_LANG); } else { + try { + G::update_php_ini( $envFile, $updatedConf ); + } catch (Exception $e) { + $info->result = false; + $info->message = G::LoadTranslation('ID_PROCESSMAKER_WRITE_CONFIG_INDEX', SYS_LANG, Array($envFile)); + $info->message .= G::LoadTranslation('ID_PROCESSMAKER_UI_NOT_INSTALL'); + $this->installLog( G::LoadTranslation('ID_INSTALL_BUT_ERROR', SYS_LANG, Array('env.ini'))); + return $info; + } + try { // update the main index file $indexFileUpdated = System::updateIndexFile(array('lang' => 'en','skin' => $updatedConf['default_skin'])); From a476ae82485cc95ba94564ef0a45a1157a04fc96 Mon Sep 17 00:00:00 2001 From: marcelo Date: Wed, 17 Apr 2013 13:07:27 -0400 Subject: [PATCH 3/6] BUG 7536 "Problem with moving a file from one folder to another folder in the ProcessMaker DMS" SOLVED -In version 2.031 and 2.0.32rc5, there is a function to allow you to move or copy a document from one folder to another, but it does not work. On move function you can add text to the combobox that shows where you would like to move a document. -Solved, The final user cant add any kind of text to the combo box that shows where you would like to move a document. --- workflow/engine/methods/appFolder/appFolderAjax.php | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php index 8d993a505..8d71ad3f4 100755 --- a/workflow/engine/methods/appFolder/appFolderAjax.php +++ b/workflow/engine/methods/appFolder/appFolderAjax.php @@ -941,6 +941,7 @@ function copyMoveAction($type) $itemField["triggerAction"] = "all"; $itemField["store"] = $folderResult; $itemField["valueField"] = "FOLDER_UID"; + $itemField["editable"] = false; $itemField["displayField"] = "FOLDER_NAME"; $itemField["selectOnFocus"] = true; $itemField["tpl"] = '
{field2}
'; From cc19021065f99588e658c53709a643e4eb21fe9b Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Wed, 17 Apr 2013 14:45:58 -0400 Subject: [PATCH 4/6] Improvement import languages - file .po is loaded in folder content/translations. --- workflow/engine/classes/class.wsTools.php | 9 +++------ workflow/engine/classes/model/Language.php | 8 +++++--- workflow/engine/methods/setup/languages_Import.php | 6 ++++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index 71bfd8e22..21f47f6b0 100755 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -302,15 +302,12 @@ class workspaceTools $names = explode(".", basename($poFile)); $extension = array_pop($names); $langid = array_pop($names); - if (strcasecmp($langid, "en") == 0) { - CLI::logging("Updating database translations with $poName\n"); - Language::import($poFile, false, true); - } elseif ($first) { + if (strcasecmp($langid, "en") != 0 && $first) { CLI::logging("Updating XML form translations with $poName\n"); Language::import($poFile, true, false); - CLI::logging("Updating database translations with $poName\n"); - Language::import($poFile, false, true); } + CLI::logging("Updating database translations with $poName\n"); + Language::import($poFile, false, true); } } diff --git a/workflow/engine/classes/model/Language.php b/workflow/engine/classes/model/Language.php index c417fb63a..3c5a8f047 100755 --- a/workflow/engine/classes/model/Language.php +++ b/workflow/engine/classes/model/Language.php @@ -275,9 +275,11 @@ class Language extends BaseLanguage $oLanguage->update( array ('LAN_ID' => $languageID,'LAN_ENABLED' => '1' ) ); - $trn = new Translation(); - $trn->generateFileTranslation( $LOCALE ); - $trn->addTranslationEnvironment( $LOCALE, $POHeaders, $countItemsSuccess ); + if ($updateXml) { + $trn = new Translation(); + $trn->generateFileTranslation( $LOCALE ); + $trn->addTranslationEnvironment( $LOCALE, $POHeaders, $countItemsSuccess ); + } //fill the results $results = new stdClass(); diff --git a/workflow/engine/methods/setup/languages_Import.php b/workflow/engine/methods/setup/languages_Import.php index c50ba9b0c..2b96356c0 100755 --- a/workflow/engine/methods/setup/languages_Import.php +++ b/workflow/engine/methods/setup/languages_Import.php @@ -97,6 +97,12 @@ try { ); $configuration->saveConfig( 'LANGUAGE_META', $importResults->lang ); + $dir = PATH_CORE . 'content' . PATH_SEP . 'translations' . PATH_SEP; + if (! is_writable( $dir )) { + throw new Exception( G::LoadTranslation( 'ID_CONTENT_FOLDER_PERMISSIONS' ) ); + } + G::uploadFile($languageFile, $dir, $languageFilename, 0777); + ini_set( 'max_execution_time', $sMaxExecutionTime ); } catch (Exception $oError) { From 074c4872951499d74d37492fd52649efeed6c4b0 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Wed, 17 Apr 2013 14:51:48 -0400 Subject: [PATCH 5/6] Improvement import languages - file .po is loaded to folder content/translations --- workflow/engine/methods/setup/languages_Import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/methods/setup/languages_Import.php b/workflow/engine/methods/setup/languages_Import.php index 2b96356c0..6fa83802e 100755 --- a/workflow/engine/methods/setup/languages_Import.php +++ b/workflow/engine/methods/setup/languages_Import.php @@ -99,7 +99,7 @@ try { $dir = PATH_CORE . 'content' . PATH_SEP . 'translations' . PATH_SEP; if (! is_writable( $dir )) { - throw new Exception( G::LoadTranslation( 'ID_CONTENT_FOLDER_PERMISSIONS' ) ); + throw new Exception( G::LoadTranslation( 'ID_TRANSLATIONS_FOLDER_PERMISSIONS' ) ); } G::uploadFile($languageFile, $dir, $languageFilename, 0777); From 2296a937e4c8ed03577136423586c74449e4ca23 Mon Sep 17 00:00:00 2001 From: jennylee Date: Wed, 17 Apr 2013 15:55:01 -0400 Subject: [PATCH 6/6] BUG 11272 Processmaker don't have to let edit UserName and Role. Now Processmaker don't let edit UserName and Role since a different Administrator role --- workflow/engine/methods/users/usersEdit.php | 3 +-- workflow/engine/methods/users/usersInit.php | 1 - workflow/engine/templates/users/users.js | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/workflow/engine/methods/users/usersEdit.php b/workflow/engine/methods/users/usersEdit.php index 80985013e..bbfd6b575 100644 --- a/workflow/engine/methods/users/usersEdit.php +++ b/workflow/engine/methods/users/usersEdit.php @@ -1,2 +1 @@ -load( $_SESSION['USER_LOGGED'] ); $mul = substr( $POST_MAX_SIZE, - 1 ); $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1))); $postMaxSize = (int) $POST_MAX_SIZE * $mul; $UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' ); $mul = substr( $UPLOAD_MAX_SIZE, - 1 ); $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1))); $uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul; if ($postMaxSize < $uploadMaxSize) $uploadMaxSize = $postMaxSize; $oHeadPublisher = & headPublisher::getSingleton(); $oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js $oHeadPublisher->assign( 'USR_UID', $_GET['USR_UID'] ); $oHeadPublisher->assign( 'ROLE', $aFields['USR_ROLE']); $oHeadPublisher->assign( 'MODE', $_GET['MODE'] ); $oHeadPublisher->assign( 'MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ' ); G::RenderPage( 'publish', 'extJs' ); \ No newline at end of file +addExtJsScript( 'users/users', true ); //adding a javascript file .js $oHeadPublisher->assign( 'USR_UID', $_GET['USR_UID'] ); $oHeadPublisher->assign( 'MODE', $_GET['MODE'] ); $oHeadPublisher->assign( 'MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ' ); G::RenderPage( 'publish', 'extJs' ); \ No newline at end of file diff --git a/workflow/engine/methods/users/usersInit.php b/workflow/engine/methods/users/usersInit.php index a1282e4dd..54aec877d 100644 --- a/workflow/engine/methods/users/usersInit.php +++ b/workflow/engine/methods/users/usersInit.php @@ -30,7 +30,6 @@ $oHeadPublisher = & headPublisher::getSingleton(); $oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js // $oHeadPublisher->addContent('users/users'); //adding a html file .html. $oHeadPublisher->assign( 'USR_UID', $aFields['USR_UID'] ); -$oHeadPublisher->assign( 'ROLE', $aFields['USR_ROLE']); $oHeadPublisher->assign( 'infoMode', true ); $oHeadPublisher->assign( 'EDITPROFILE', 1); $oHeadPublisher->assign( 'canEdit', $canEdit ); diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js index b1f0d5a33..38f2f3232 100644 --- a/workflow/engine/templates/users/users.js +++ b/workflow/engine/templates/users/users.js @@ -394,7 +394,6 @@ Ext.onReady(function () { selectOnFocus : true, editable : false, allowBlank : false, - hidden : (typeof(ROLE) != "undefined" && ROLE == "PROCESSMAKER_ADMIN")? false : true, triggerAction : 'all', mode : 'local' }); @@ -423,7 +422,6 @@ Ext.onReady(function () { width : 260, allowBlank : false, hidden : (typeof EDITPROFILE != "undefined" && EDITPROFILE == 1)? true : false, - hidden : (typeof(ROLE) != "undefined" && ROLE == "PROCESSMAKER_ADMIN")? false : true, listeners: { blur : function(ob) {