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

HOR-3313

Browse Source
This commit is contained in:
Paula Quispe
2017-05-31 12:11:58 -04:00
parent 2311342f6c
commit 16f3afc6e7
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -15163,6 +15163,12 @@ msgstr "SYSTEM INSTALLATION FAILED"
msgid "A problem occurred during the installation of the system. Please, uninstall the partial installation and try again." msgid "A problem occurred during the installation of the system. Please, uninstall the partial installation and try again."
msgstr "A problem occurred during the installation of the system. Please, uninstall the partial installation and try again." msgstr "A problem occurred during the installation of the system. Please, uninstall the partial installation and try again."
# TRANSLATION
# LABEL/ID_PROCESSMAKER_ALREADY_INSTALLED
#: LABEL/ID_PROCESSMAKER_ALREADY_INSTALLED
msgid "ProcessMaker is already installed."
msgstr "ProcessMaker is already installed."
# TRANSLATION # TRANSLATION
# LABEL/ID_LICENSE_EMPTY # LABEL/ID_LICENSE_EMPTY
#: LABEL/ID_LICENSE_EMPTY #: LABEL/ID_LICENSE_EMPTY

14
workflow/engine/controllers/installer.php
View File

@@ -38,10 +38,18 @@ class Installer extends Controller
public function index ($httpData) public function index ($httpData)
{ {
if (file_exists(FILE_PATHS_INSTALLED)) {
$this->setJSVar('messageError', G::LoadTranslation('ID_PROCESSMAKER_ALREADY_INSTALLED'));
$this->includeExtJS('installer/stopInstall');
$this->setView('installer/mainStopInstall');
G::RenderPage('publish', 'extJs');
return;
}
if ((strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') && (file_exists($this->path_shared . 'partner.info'))) { if ((strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') && (file_exists($this->path_shared . 'partner.info'))) {
$this->includeExtJS( 'installer/stopInstall'); $this->setJSVar('messageError', G::LoadTranslation('ID_NO_INSTALL'));
$this->setView( 'installer/mainStopInstall' ); $this->includeExtJS('installer/stopInstall');
G::RenderPage( 'publish', 'extJs' ); $this->setView('installer/mainStopInstall');
G::RenderPage('publish', 'extJs');
return; return;
} }

1
workflow/engine/data/mysql/insert.sql
View File

@@ -4022,6 +4022,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_ROLE_NAME_NOT_EMPTY','en','The ''Name'' field can not be empty.','2014-01-15') , ( 'LABEL','ID_ROLE_NAME_NOT_EMPTY','en','The ''Name'' field can not be empty.','2014-01-15') ,
( 'LABEL','ID_TITLE_NO_INSTALL','en','SYSTEM INSTALLATION FAILED','2014-01-15') , ( 'LABEL','ID_TITLE_NO_INSTALL','en','SYSTEM INSTALLATION FAILED','2014-01-15') ,
( 'LABEL','ID_NO_INSTALL','en','A problem occurred during the installation of the system. Please, uninstall the partial installation and try again.','2014-01-15') , ( 'LABEL','ID_NO_INSTALL','en','A problem occurred during the installation of the system. Please, uninstall the partial installation and try again.','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_ALREADY_INSTALLED','en','ProcessMaker is already installed.','2017-05-31') ,
( 'LABEL','ID_LICENSE_EMPTY','en','Can not find any license','2014-01-15') , ( 'LABEL','ID_LICENSE_EMPTY','en','Can not find any license','2014-01-15') ,
( 'LABEL','ID_ADD_LICENSE','en','Please add a new license','2014-01-15') , ( 'LABEL','ID_ADD_LICENSE','en','Please add a new license','2014-01-15') ,
( 'LABEL','ID_DEFAULT_CALENDAR','en','Default Calendar','2014-01-15') , ( 'LABEL','ID_DEFAULT_CALENDAR','en','Default Calendar','2014-01-15') ,

2
workflow/engine/templates/installer/stopInstall.js
View File

@@ -9,7 +9,7 @@ Ext.onReady(function() {
title : _('ID_TITLE_NO_INSTALL'), title : _('ID_TITLE_NO_INSTALL'),
items:[ items:[
{html: _('ID_NO_INSTALL')} {html: messageError}
] ]
}); });
}); });