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

Merge branch 'master' of git://github.com/colosa/processmaker into BUG-0000

Browse Source
This commit is contained in:
Victor Saisa Lopez
2013-04-18 09:01:46 -04:00
parent 5b2f34c441 2980c58c8d
commit f6b48e3052
6 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/methods/appFolder/appFolderAjax.php
View File

@@ -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"] = '<tpl for="."><div ext:qtip="{field2}" class="x-combo-list-item">{field2}</div></tpl>';

6
workflow/engine/methods/setup/languages_Import.php
View File

@@ -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_TRANSLATIONS_FOLDER_PERMISSIONS' ) );
}
G::uploadFile($languageFile, $dir, $languageFilename, 0777);
ini_set( 'max_execution_time', $sMaxExecutionTime );
} catch (Exception $oError) {