diff --git a/lib/base/dao/dao.class.php b/lib/base/dao/dao.class.php index a477f71571..61cc74b33d 100644 --- a/lib/base/dao/dao.class.php +++ b/lib/base/dao/dao.class.php @@ -950,7 +950,7 @@ class baseDAO public function getRow($data) { if(!is_object($data)) return $data; - return json_decode(json_encode($data)); + return clone $data; } //-------------------- 魔术方法(Magic methods) --------------------// diff --git a/module/branch/model.php b/module/branch/model.php index 2201ad1b8c..ea132227d3 100644 --- a/module/branch/model.php +++ b/module/branch/model.php @@ -24,6 +24,7 @@ class branchModel extends model { if(empty($productID)) $productID = $this->session->product; $product = $this->loadModel('product')->getById($productID); + if(empty($product) or !isset($this->lang->product->branchName[$product->type])) return false; return $this->lang->branch->all . $this->lang->product->branchName[$product->type]; } return $this->dao->select('*')->from(TABLE_BRANCH)->where('id')->eq($branchID)->fetch('name'); diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index 342ecd1dac..4790974f7f 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -14,18 +14,17 @@ $lang->index->menuOrder[5] = 'product'; $lang->index->menuOrder[10] = 'project'; /* my menu order. */ -$lang->my->menuOrder[5] = 'account'; -$lang->my->menuOrder[10] = 'index'; -$lang->my->menuOrder[15] = 'calendar'; -$lang->my->menuOrder[20] = 'task'; -$lang->my->menuOrder[25] = 'bug'; -$lang->my->menuOrder[30] = 'testtask'; -$lang->my->menuOrder[35] = 'story'; -$lang->my->menuOrder[40] = 'myProject'; -$lang->my->menuOrder[45] = 'dynamic'; -$lang->my->menuOrder[50] = 'profile'; -$lang->my->menuOrder[55] = 'changePassword'; -$lang->my->menuOrder[60] = 'score'; +$lang->my->menuOrder[5] = 'index'; +$lang->my->menuOrder[10] = 'calendar'; +$lang->my->menuOrder[15] = 'task'; +$lang->my->menuOrder[20] = 'bug'; +$lang->my->menuOrder[25] = 'testtask'; +$lang->my->menuOrder[30] = 'story'; +$lang->my->menuOrder[35] = 'myProject'; +$lang->my->menuOrder[40] = 'dynamic'; +$lang->my->menuOrder[45] = 'profile'; +$lang->my->menuOrder[50] = 'changePassword'; +$lang->my->menuOrder[55] = 'score'; $lang->todo->menuOrder = $lang->my->menuOrder; /* product menu order. */ diff --git a/module/my/model.php b/module/my/model.php index e460ec0bd5..9b45ca27c5 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -21,8 +21,6 @@ class myModel extends model */ public function setMenu() { - if(isset($this->lang->my->menu->account['link'])) $this->lang->my->menu->account['link'] = sprintf($this->lang->my->menu->account['link'], $this->app->user->realname); - /* Adjust the menu order according to the user role. */ $role = $this->app->user->role; if($role == 'qa') diff --git a/module/project/model.php b/module/project/model.php index 35b4560e49..9611080ba6 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -208,7 +208,7 @@ class projectModel extends model $output .= ""; if($isMobile) $output = "{$currentProject->name} "; - if($buildID) + if($buildID and !$isMobile) { setCookie('lastBuild', $buildID, $this->config->cookieLife, $this->config->webRoot); $currentBuild = $this->loadModel('build')->getById($buildID); diff --git a/module/testtask/model.php b/module/testtask/model.php index 89c3c60e5e..5b782a3aa7 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -26,7 +26,7 @@ class testtaskModel extends model $this->loadModel('product')->setMenu($products, $productID, $branch); $selectHtml = $this->product->select($products, $productID, 'testtask', 'browse', '', $branch); - if($testtask) + if($testtask and $this->app->viewType != 'mhtml') { $testtasks = $this->getProductTasks($productID, 0, 'id_desc', null, array('local', 'totalStatus')); diff --git a/module/user/control.php b/module/user/control.php index d068d1cbe4..00d92cf01d 100644 --- a/module/user/control.php +++ b/module/user/control.php @@ -672,7 +672,8 @@ class user extends control } if(strpos($this->referer, $loginLink) === false and - strpos($this->referer, $denyLink) === false and $this->referer + strpos($this->referer, $denyLink) === false and + strpos($this->referer, 'block') === false and $this->referer ) { die(js::locate($this->referer, 'parent')); @@ -716,7 +717,7 @@ class user extends control if($this->post->keepLogin) $this->user->keepLogin($user); /* Go to the referer. */ - if($this->post->referer and strpos($this->post->referer, $loginLink) === false and strpos($this->post->referer, $denyLink) === false) + if($this->post->referer and strpos($this->post->referer, $loginLink) === false and strpos($this->post->referer, $denyLink) === false and strpos($this->post->referer, 'block') === false) { if($this->app->getViewType() == 'json') {