fixing issue of Custom Case List not showed, and some translation issues
This commit is contained in:
@@ -23,5 +23,5 @@ return [
|
|||||||
| directory. However, as usual, you are free to change this value.
|
| directory. However, as usual, you are free to change this value.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'compiled' => realpath(dirname(__DIR__) . '/' . 'bootstrap/cache/views')
|
'compiled' => base_path("shared")
|
||||||
];
|
];
|
||||||
@@ -534,6 +534,7 @@ class Bootstrap
|
|||||||
|
|
||||||
// if the default translations table doesn't exist we can't proceed
|
// if the default translations table doesn't exist we can't proceed
|
||||||
if (!is_file(PATH_LANGUAGECONT . 'translation.en')) {
|
if (!is_file(PATH_LANGUAGECONT . 'translation.en')) {
|
||||||
|
error_log("The default translations table doesn't exist we can't get the translation " . PATH_LANGUAGECONT );
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
global $translation;
|
global $translation;
|
||||||
@@ -874,7 +875,7 @@ class Bootstrap
|
|||||||
return 'var TRANSLATIONS_' . strtoupper($typeName) . ' = ' . Bootstrap::json_encode($translationToEncode) . ';';
|
return 'var TRANSLATIONS_' . strtoupper($typeName) . ' = ' . Bootstrap::json_encode($translationToEncode) . ';';
|
||||||
} else {
|
} else {
|
||||||
error_log("Missing or invalid translation array for type: " . $typeName);
|
error_log("Missing or invalid translation array for type: " . $typeName);
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return '';
|
return '';
|
||||||
|
|||||||
@@ -1234,7 +1234,7 @@ class System
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Here if you validate if the type of data obtained from the configuration
|
* Here if you validate if the type of data obtained from the configuration
|
||||||
* files are valid, otherwise the default value is used.
|
* files are valid, otherwise the default value is used.
|
||||||
*/
|
*/
|
||||||
$value = (string) $config['mobile_offline_tables_download_interval'];
|
$value = (string) $config['mobile_offline_tables_download_interval'];
|
||||||
@@ -1578,7 +1578,7 @@ class System
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set Connection Configuration using "config" helper from "Laravel" with
|
* Set Connection Configuration using "config" helper from "Laravel" with
|
||||||
* the constants defined in file "db.php"
|
* the constants defined in file "db.php"
|
||||||
*/
|
*/
|
||||||
public static function setConnectionConfig(
|
public static function setConnectionConfig(
|
||||||
@@ -1613,7 +1613,7 @@ class System
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get current server protocol.
|
* Get current server protocol.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public static function getServerProtocol()
|
public static function getServerProtocol()
|
||||||
@@ -1624,7 +1624,7 @@ class System
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get current server host
|
* Get current server host
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public static function getServerHostname()
|
public static function getServerHostname()
|
||||||
@@ -1641,7 +1641,7 @@ class System
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get current server port.
|
* Get current server port.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public static function getServerPort()
|
public static function getServerPort()
|
||||||
@@ -1655,7 +1655,7 @@ class System
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get current host (hostname + port).
|
* Get current host (hostname + port).
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public static function getServerHost()
|
public static function getServerHost()
|
||||||
@@ -1669,7 +1669,7 @@ class System
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get current server protocol and host.
|
* Get current server protocol and host.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public static function getServerProtocolHost()
|
public static function getServerProtocolHost()
|
||||||
@@ -1679,7 +1679,7 @@ class System
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get server main path (protocol + host + port + workspace + lang + skin).
|
* Get server main path (protocol + host + port + workspace + lang + skin).
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
* @see ProcessMaker\BusinessModel\ProjectUser->projectWsUserCanStartTask()
|
* @see ProcessMaker\BusinessModel\ProjectUser->projectWsUserCanStartTask()
|
||||||
* @see ProcessMaker\BusinessModel\ProjectUser->userLogin()
|
* @see ProcessMaker\BusinessModel\ProjectUser->userLogin()
|
||||||
@@ -1691,8 +1691,8 @@ class System
|
|||||||
* @see workflow/engine/classes/ProcessMap.php ProcessMap->listNewWebEntry()
|
* @see workflow/engine/classes/ProcessMap.php ProcessMap->listNewWebEntry()
|
||||||
* @see workflow/engine/classes/ProcessMap.php ProcessMap->webEntry()
|
* @see workflow/engine/classes/ProcessMap.php ProcessMap->webEntry()
|
||||||
* @see workflow/engine/controllers/caseSchedulerProxy.php caseSchedulerProxy->checkCredentials()
|
* @see workflow/engine/controllers/caseSchedulerProxy.php caseSchedulerProxy->checkCredentials()
|
||||||
* @see workflow/engine/methods/cases/cases_SchedulerValidateUser.php
|
* @see workflow/engine/methods/cases/cases_SchedulerValidateUser.php
|
||||||
* @see workflow/engine/methods/processes/processes_webEntryGenerate.php
|
* @see workflow/engine/methods/processes/processes_webEntryGenerate.php
|
||||||
* @see workflow/engine/methods/processes/processes_webEntryValidate.php
|
* @see workflow/engine/methods/processes/processes_webEntryValidate.php
|
||||||
* @see workflow/engine/methods/processes/webEntry_Val_Assig.php
|
* @see workflow/engine/methods/processes/webEntry_Val_Assig.php
|
||||||
*/
|
*/
|
||||||
@@ -1705,7 +1705,7 @@ class System
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get default domain mail.
|
* Get default domain mail.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public static function getDefaultMailDomain()
|
public static function getDefaultMailDomain()
|
||||||
@@ -1737,20 +1737,21 @@ class System
|
|||||||
{
|
{
|
||||||
//default values
|
//default values
|
||||||
$result = [
|
$result = [
|
||||||
'pathData' => getcwd() . '/shared',
|
'pathData' => base_path('shared'),
|
||||||
'pathCompiled' => getcwd() . '/shared/compiled',
|
'pathCompiled' => base_path('shared/compiled'),
|
||||||
];
|
];
|
||||||
|
|
||||||
$pathsInstalled = getcwd() . "/workflow/engine/config/paths_installed.php";
|
$pathsInstalled = base_path("shared/config/paths_installed.php");
|
||||||
if (file_exists($pathsInstalled)) {
|
if (file_exists($pathsInstalled)) {
|
||||||
$script = "require_once '{$pathsInstalled}';"
|
# $script = "require_once '{$pathsInstalled}';"
|
||||||
. "return ["
|
# . "return ["
|
||||||
. "'pathData' => PATH_DATA,"
|
# . "'pathData' => PATH_DATA,"
|
||||||
. "'pathCompiled' => PATH_C,"
|
# . "'pathCompiled' => PATH_C,"
|
||||||
. "'hashInstallation' => HASH_INSTALLATION,"
|
# . "'hashInstallation' => HASH_INSTALLATION,"
|
||||||
. "'systemHash' => SYSTEM_HASH,"
|
# . "'systemHash' => SYSTEM_HASH,"
|
||||||
. "];";
|
# . "];";
|
||||||
$result = eval($script);
|
# $result = eval($script);
|
||||||
|
# print $result;
|
||||||
}
|
}
|
||||||
return (object) $result;
|
return (object) $result;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,4 +35,3 @@
|
|||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
try {literal}{{/literal} dynaformSetFocus();}catch(e){literal}{{/literal}}
|
try {literal}{{/literal} dynaformSetFocus();}catch(e){literal}{{/literal}}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -32,4 +32,3 @@
|
|||||||
{$form.JS}
|
{$form.JS}
|
||||||
</script>
|
</script>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user