diff --git a/lib/dbh/dbh.class.php b/lib/dbh/dbh.class.php index 3a4c0681a2..7502b56916 100644 --- a/lib/dbh/dbh.class.php +++ b/lib/dbh/dbh.class.php @@ -152,7 +152,7 @@ class dbh $sql = "SHOW DATABASES like '{$this->config->name}'"; break; case 'dm': - $sql = "SELECT * FROM dba_objects WHERE object_type='SCH' AND owner='{$this->config->name}'"; + $sql = "SELECT * FROM ALL_OBJECTS WHERE object_type='SCH' AND owner='{$this->config->name}'"; break; default: $sql = ''; @@ -204,6 +204,7 @@ class dbh return $this->rawQuery($sql); case 'dm': + /* $tableSpace = strtoupper($this->config->name); $res = $this->rawQuery("SELECT * FROM dba_data_files WHERE TABLESPACE_NAME = '$tableSpace'")->fetchAll(); @@ -215,8 +216,9 @@ class dbh $this->rawQuery($createTableSpace); $this->rawQuery($createUser); } + */ - $createSchema = "CREATE SCHEMA {$this->config->name} AUTHORIZATION {$this->config->name}"; + $createSchema = "CREATE SCHEMA {$this->config->name} AUTHORIZATION {$this->config->user}"; return $this->rawQuery($createSchema); default: diff --git a/module/user/js/login.js b/module/user/js/login.js index 9349326727..b06595f28c 100644 --- a/module/user/js/login.js +++ b/module/user/js/login.js @@ -19,7 +19,7 @@ $(document).ready(function() $('#account').focus(); - $("#langs li > a").click(function() + $("#langs li > a").click(function() { selectLang($(this).data('value')); }); @@ -53,9 +53,9 @@ $(document).ready(function() url: link, dataType: 'json', method: 'POST', - data: + data: { - "account": account, + "account": account, "password": hasMD5 ? md5(md5(password) + rand) : password, 'passwordStrength' : passwordStrength, 'referer' : referer, @@ -65,7 +65,7 @@ $(document).ready(function() }, success:function(data) { - if(data.result == 'fail') + if(data.result == 'fail') { alert(data.message); if($('.captchaBox').length == 1) $('.captchaBox .input-group .input-group-addon img').click(); @@ -81,7 +81,7 @@ $(document).ready(function() }); /** - * Refresh captcha. + * Refresh captcha. */ $('.captchaBox .input-group .input-group-addon img').click(function() { @@ -95,7 +95,7 @@ $(document).ready(function() /** * Show notice for one click package use weak password. - * + * * @access public * @return void */ diff --git a/module/user/model.php b/module/user/model.php index edf9912927..4ceb2267f0 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -1792,7 +1792,7 @@ class userModel extends model /* Init objects. */ static $allProducts, $allPrograms, $allProjects, $allSprints, $teams, $stakeholders, $productWhiteList, $whiteList; - if($allProducts === null) $allProducts = $this->dao->select('id,PO,QD,RD,createdBy,acl,whitelist,program,createdBy')->from(TABLE_PRODUCT)->where('acl')->ne('open')->fetchAll('id'); + if($allProducts === null) $allProducts = $this->dao->select('id,PO,QD,RD,acl,whitelist,program,createdBy')->from(TABLE_PRODUCT)->where('acl')->ne('open')->fetchAll('id'); if($allProjects === null) $allProjects = $this->dao->select('id,PO,PM,QD,RD,acl,type,path,parent,openedBy')->from(TABLE_PROJECT)->where('acl')->ne('open')->andWhere('type')->eq('project')->fetchAll('id'); if($allPrograms === null) $allPrograms = $this->dao->select('id,PO,PM,QD,RD,acl,type,path,parent,openedBy')->from(TABLE_PROGRAM)->where('acl')->ne('open')->andWhere('type')->eq('program')->fetchAll('id'); if($allSprints === null) $allSprints = $this->dao->select('id,PO,PM,QD,RD,acl,project,path,parent,type,openedBy')->from(TABLE_PROJECT)->where('acl')->eq('private')->andWhere('type')->in('sprint,stage,kanban')->fetchAll('id');