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

Merged in 3.1 (pull request #4540)

Browse Source 
Updating repo 3.1-CONTENT
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-07 14:54:45 -04:00
parent 65d97aa794 5b96e90578
commit 2eac7c1ac0
39 changed files with 973 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,7 @@ class Installer extends Controller
$info->memory = new stdclass();
$info->php->version = phpversion();
$info->php->result = version_compare(phpversion(), '5.5.33') >= 0 ? true : false;
$info->php->result = (version_compare(phpversion(), '5.4', '>=') && version_compare(phpversion(), '7.0', '<')) ? true : false;
// MYSQL info and verification
$info->mysql->result = false;
@@ -727,7 +727,7 @@ class Installer extends Controller
$rb_workpace = $wf;
$rp_workpace = $wf;
if (!$userLogged) {
$wfPass = G::generate_password( 12 );
$wfPass = G::generate_password( 15 );
$this->setGrantPrivilegesMySQL( $wf, $wfPass, $wf, $db_hostname );
$this->setGrantPrivilegesMySQL( $rb, $wfPass, $wf, $db_hostname );
$this->setGrantPrivilegesMySQL( $rp, $wfPass, $wf, $db_hostname );
@@ -1064,7 +1064,7 @@ class Installer extends Controller
$this->mssqlQuery( $q );
//CREATE users and GRANT Privileges
$wfPass = G::generate_password( 12 );
$wfPass = G::generate_password( 15 );
$this->setGrantPrivilegesMSSQL( $wf, $wfPass, $wf );
//Generate the db.php file and folders

4
workflow/engine/controllers/pmTables.php
View File

@@ -101,6 +101,10 @@ class pmTables extends Controller
}
}
if (preg_match("/^PMT_(.*)$/", $table['ADD_TAB_NAME'], $match)) {
$table['ADD_TAB_NAME'] = $match[1];
}
$this->includeExtJS( 'pmTables/' . $jsFile );
$this->setJSVar( 'flagProcessmap', (isset($_REQUEST['flagProcessmap'])) ? $_REQUEST['flagProcessmap'] : 0);