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

Merge branch '3.0.1-GA' of bitbucket.org:colosa/processmaker into 3.0.1-GA

Browse Source
This commit is contained in:
Ronald Quenta
2015-07-30 12:38:24 -04:00
parent 73c0a6e929 d07e193177
commit 90d0f7f39b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/Language.php
View File

@@ -296,7 +296,7 @@ class Language extends BaseLanguage
//get labels MichelangeloFE //get labels MichelangeloFE
try { try {
$oTranslation = new Translation(); $oTranslation = new Translation();
$MichelangeloFE = PATH_HOME . "../vendor/colosa/MichelangeloFE/src"; $MichelangeloFE = PATH_HOME . "../workflow/public_html/lib/js";
if ($_GET['LOCALE'] === "en" & file_exists($MichelangeloFE)) { if ($_GET['LOCALE'] === "en" & file_exists($MichelangeloFE)) {
$labels = $this->readLabelsDirectory($MichelangeloFE, true); $labels = $this->readLabelsDirectory($MichelangeloFE, true);
foreach ($labels as $label) { foreach ($labels as $label) {

4
workflow/engine/templates/cases/casesList.js
View File

@@ -1697,7 +1697,7 @@ Ext.onReady ( function() {
var toolbarTodo = [ var toolbarTodo = [
optionMenuOpen, optionMenuOpen,
{ {
xtype: 'tbsplit', xtype: 'tbbutton',
text: _('ID_ACTIONS'), text: _('ID_ACTIONS'),
menu: menuItems menu: menuItems
}, },
@@ -1783,7 +1783,7 @@ Ext.onReady ( function() {
var toolbarDraft = [ var toolbarDraft = [
optionMenuOpen, optionMenuOpen,
{ {
xtype: 'tbsplit', xtype: 'tbbutton',
text: _('ID_ACTIONS'), text: _('ID_ACTIONS'),
menu: menuItems menu: menuItems
}, },