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

Fix to grant super on upgrades for triggers (bug 6114).

Browse Source
This commit is contained in:
Alexandre Rosenfeld
2011-02-23 20:27:15 +00:00
parent b467a2cdef
commit 321959228e
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
workflow/engine/classes/class.wsTools.php
View File

@@ -389,9 +389,11 @@ class workspaceTools {
* @param bool $checkOnly only check if the upgrade is needed if true
* @param string $lang not currently used
*/
public function upgradeCacheView($checkOnly = false, $lang = "en") {
public function upgradeCacheView() {
$this->initPropel(true);
$lang = "en";
require_once('classes/model/AppCacheView.php');
//check the language, if no info in config about language, the default is 'en'
@@ -406,21 +408,19 @@ class workspaceTools {
$userGrants = $appCache->checkGrantsForUser( false );
$currentUser = $res['user'];
$currentUserIsSuper = $res['super'];
$currentUser = $userGrants['user'];
$currentUserIsSuper = $userGrants['super'];
//if user does not have the SUPER privilege we need to use the root user and grant the SUPER priv. to normal user.
if (!$currentUserIsSuper && !$checkOnly) {
$res = $appCache->checkGrantsForUser( true );
$res = $appCache->setSuperForUser( $currentUser );
if (!$currentUserIsSuper) {
$appCache->checkGrantsForUser( true );
$appCache->setSuperForUser( $currentUser );
$currentUserIsSuper = true;
}
CLI::logging("Creating table");
//now check if table APPCACHEVIEW exists, and it have correct number of fields, etc.
if (!$checkOnly) {
$res = $appCache->checkAppCacheView();
}
$res = $appCache->checkAppCacheView();
CLI::logging(", triggers");
//now check if we have the triggers installed
@@ -430,13 +430,10 @@ class workspaceTools {
$triggers[] = $appCache->triggerApplicationUpdate($lang, $checkOnly);
$triggers[] = $appCache->triggerApplicationDelete($lang, $checkOnly);
if (!$checkOnly) {
CLI::logging(", filling cache view");
//build using the method in AppCacheView Class
$res = $appCache->fillAppCacheView($lang);
CLI::logging(".");
}
CLI::logging("\n");
CLI::logging(", filling cache view");
//build using the method in AppCacheView Class
$res = $appCache->fillAppCacheView($lang);
CLI::logging(".\n");
//set status in config table
$confParams = Array(
'LANG' => $lang,