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

Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2

Browse Source
This commit is contained in:
Dante
2015-04-22 13:31:18 -04:00
parent 9e6150a2c4 71c18bd6e7
commit 32b9b938f3
22 changed files with 360 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/public_html/sysGeneric.php
View File

@@ -692,16 +692,22 @@ ob_start();
// Rebuild the base Workflow translations if not exists
if (! is_file( PATH_LANGUAGECONT . 'translation.en' )) {
$pathFile = $filter->validateInput("classes/model/Translation.php",'path');
$pathFile = $filter->validateInput(PATH_CLASSES . "model" . PATH_SEP . "Translation.php", "path");
require_once ($pathFile);
$fields = Translation::generateFileTranslation( 'en' );
$pmTranslation = new Translation();
$fields = $pmTranslation->generateFileTranslation("en");
}
// TODO: Verify if the language set into url is defined in translations env.
if (SYS_LANG != 'en' && ! is_file( PATH_LANGUAGECONT . 'translation.' . SYS_LANG )) {
$pathFile = $filter->validateInput("classes/model/Translation.php",'path');
$pathFile = $filter->validateInput(PATH_CLASSES . "model" . PATH_SEP . "Translation.php", "path");
require_once ($pathFile);
$fields = Translation::generateFileTranslation( SYS_LANG );
$pmTranslation = new Translation();
$fields = $pmTranslation->generateFileTranslation(SYS_LANG);
}
// Setup plugins
@@ -894,6 +900,7 @@ if (! defined( 'EXECUTE_BY_CRON' )) {
$noLoginFiles[] = 'appFolderAjax';
$noLoginFiles[] = 'steps_Ajax';
$noLoginFiles[] = 'proxyCasesList';
$noLoginFiles[] = 'proxyNewCasesList';
$noLoginFiles[] = 'casesStartPage_Ajax';
$noLoginFiles[] = 'appProxy';
$noLoginFiles[] = 'cases_Ajax';