From 8856efb813b4787bafb0ed4d2f9f420f6ab04b25 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 18 May 2016 16:39:57 +0800
Subject: [PATCH 1/6]  * fix bug for all page for project and product.  * fix
 bug for manage tree and dept.

---
 module/dept/view/browse.html.php     | 11 ++++++++---
 module/product/view/all.html.php     |  2 +-
 module/project/view/all.html.php     |  2 +-
 module/tree/view/browse.html.php     |  2 ++
 module/tree/view/browsetask.html.php | 11 ++++++++---
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/module/dept/view/browse.html.php b/module/dept/view/browse.html.php
index ad83fce354..9467fd03b8 100644
--- a/module/dept/view/browse.html.php
+++ b/module/dept/view/browse.html.php
@@ -98,8 +98,7 @@
 $(function()
 {
     var data = $.parseJSON('<?php echo json_encode($tree);?>');
-    var $tree = $('#deptTree').tree(
-    {
+    var options = {
         name: 'deptTree',
         initialState: 'preserve',
         data: data,
@@ -164,7 +163,13 @@ $(function()
                 });
             }
         }
-    });
+    };
+
+    if(<?php echo common::hasPriv('dept', 'updateorder') ? 'false' : 'true' ?>) options.actions["sort"] = false;
+    if(<?php echo common::hasPriv('dept', 'edit') ? 'false' : 'true' ?>) options.actions["edit"] = false;
+    if(<?php echo common::hasPriv('dept', 'delete') ? 'false' : 'true' ?>) options.actions["delete"] = false;
+
+    var $tree = $('#deptTree').tree(options);
 
     var tree = $tree.data('zui.tree');
     if(!tree.store.time) tree.expand($tree.find('li:not(.tree-action-item)').first());
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index bc717e4b63..8d0cbdd7ad 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -37,7 +37,7 @@
 <?php $canOrder = (common::hasPriv('product', 'updateOrder') and strpos($orderBy, 'order') !== false)?>
 <form method='post' action='<?php echo inLink('batchEdit', "productID=$productID");?>' id='productsForm'>
   <table class='table table-condensed table-hover table-striped tablesorter' id='productList'>
-    <?php $vars = "locate=no&productID=$productID&status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
+    <?php $vars = "productID=$productID&status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
     <thead>
       <tr>
         <th class='w-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php
index 0b35be0ef9..302e2bb608 100644
--- a/module/project/view/all.html.php
+++ b/module/project/view/all.html.php
@@ -29,7 +29,7 @@
 <?php $canOrder = (common::hasPriv('project', 'updateOrder') and strpos($orderBy, 'order') !== false)?>
 <form id='projectsForm' class='form-condensed' method='post' action='<?php echo inLink('batchEdit', "projectID=$projectID");?>'>
 <table class='table table-fixed tablesorter' id='projectList'>
-  <?php $vars = "locate=no&status=$status&projectID=$projectID&orderBy=%s&productID=$productID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
+  <?php $vars = "status=$status&projectID=$projectID&orderBy=%s&productID=$productID&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
   <thead>
     <tr>
       <th class='w-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index 68e282aa12..4721df7706 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -185,6 +185,8 @@ $(function()
     };
 
     if(<?php echo common::hasPriv('tree', 'updateorder') ? 'false' : 'true' ?>) options.actions["sort"] = false;
+    if(<?php echo common::hasPriv('tree', 'edit') ? 'false' : 'true' ?>) options.actions["edit"] = false;
+    if(<?php echo common::hasPriv('tree', 'delete') ? 'false' : 'true' ?>) options.actions["delete"] = false;
 
     var $tree = $('#modulesTree').tree(options);
 
diff --git a/module/tree/view/browsetask.html.php b/module/tree/view/browsetask.html.php
index 00fb728537..4b59e564bb 100644
--- a/module/tree/view/browsetask.html.php
+++ b/module/tree/view/browsetask.html.php
@@ -102,8 +102,7 @@
 $(function()
 {
     var data = $.parseJSON('<?php echo json_encode($tree);?>');
-    var $tree = $('#modulesTree').tree(
-    {
+    var options = {
         name: 'tree-project-edit',
         initialState: 'preserve',
         data: data,
@@ -180,7 +179,13 @@ $(function()
                 });
             }
         }
-    });
+    };
+
+    if(<?php echo common::hasPriv('tree', 'updateorder') ? 'false' : 'true' ?>) options.actions["sort"] = false;
+    if(<?php echo common::hasPriv('tree', 'edit') ? 'false' : 'true' ?>) options.actions["edit"] = false;
+    if(<?php echo common::hasPriv('tree', 'delete') ? 'false' : 'true' ?>) options.actions["delete"] = false;
+
+    var $tree = $('#modulesTree').tree(options);
 
     var tree = $tree.data('zui.tree');
     if(!tree.store.time) tree.expand($tree.find('li:not(.tree-action-item)').first());

From f3b764c07921ba24201f8827d516b5089088161a Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 19 May 2016 11:41:52 +0800
Subject: [PATCH 2/6]  * adjust for check custom pri and severity when create.

---
 module/bug/view/create.html.php      | 28 ++++++++++++++++++++++++----
 module/story/view/create.html.php    | 14 ++++++++++++--
 module/task/view/create.html.php     | 24 +++++++++++++++++-------
 module/testcase/view/create.html.php | 14 ++++++++++++--
 4 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index e1f0135a39..27f771289e 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -126,8 +126,18 @@ js::set('refresh', $lang->refresh);
               <div class='input-group'>
                 <?php if($showSeverity):?>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->bug->severity;?></span>
-                <?php $isAllNumberSeverity = is_numeric(join($lang->bug->severityList));?>
-                <?php if(!$isAllNumberSeverity):?>
+                <?php
+                $hasCustomSeverity = false;
+                foreach($lang->bug->severityList as $severityKey => $severityValue)
+                {
+                    if($severityKey != $severityValue)
+                    {
+                        $hasCustomSeverity = true;
+                        break;
+                    }
+                }
+                ?>
+                <?php if($hasCustomSeverity):?>
                 <?php echo html::select('severity', (array)$lang->bug->severityList, $severity, "class='form-control minw-80px'");?> 
                 <?php else: ?>
                 <div class='input-group-btn dropdown-pris' data-prefix='severity'>
@@ -141,8 +151,18 @@ js::set('refresh', $lang->refresh);
                 <?php endif;?>
                 <?php if($showPri):?>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->bug->pri;?></span>
-                <?php $isAllNumberPri = is_numeric(join($lang->bug->priList));?>
-                <?php if(!$isAllNumberPri):?>
+                <?php
+                $hasCustomPri = false;
+                foreach($lang->bug->priList as $priKey => $priValue)
+                {
+                    if($priKey != $priValue)
+                    {
+                        $hasCustomPri = true;
+                        break;
+                    }
+                }
+                ?>
+                <?php if($hasCustomPri):?>
                 <?php echo html::select('pri', (array)$lang->bug->priList, '', "class='form-control minw-80px'");?> 
                 <?php else: ?>
                 <div class='input-group-btn dropdown-pris'>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 4b27ee1c4f..51c140f795 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -105,8 +105,18 @@
               <div class="input-group">
                 <?php if(!$hiddenPri):?>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->story->pri;?></span>
-                <?php $isAllNumberPri = is_numeric(join('', $lang->story->priList)); ?>
-                <?php if(!$isAllNumberPri):?>
+                <?php
+                $hasCustomPri = false;
+                foreach($lang->story->priList as $priKey => $priValue)
+                {
+                    if($priKey != $priValue)
+                    {
+                        $hasCustomPri = true;
+                        break;
+                    }
+                }
+                ?>
+                <?php if($hasCustomPri):?>
                 <?php echo html::select('pri', (array)$lang->story->priList, $pri, "class='form-control minw-80px'");?> 
                 <?php else: ?>
                 <div class='input-group-btn dropdown-pris' data-set='0,1,2,3,4'>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 58ce1e728c..f74b8d1870 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -74,8 +74,18 @@
               <div class="input-group">
                 <?php if(!$hiddenPri):?>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->task->pri;?></span>
-                <?php $isAllNumberPri = is_numeric(join($lang->task->priList));?>
-                <?php if(!$isAllNumberPri):?>
+                <?php
+                $hasCustomPri = false;
+                foreach($lang->task->priList as $priKey => $priValue)
+                {
+                    if($priKey != $priValue)
+                    {
+                        $hasCustomPri = true;
+                        break;
+                    }
+                }
+                ?>
+                <?php if($hasCustomPri):?>
                 <?php echo html::select('pri', $lang->task->priList, '', "class='form-control minw-80px'");?> 
                 <?php else: ?>
                 <div class='input-group-btn dropdown-pris'>
@@ -101,11 +111,11 @@
         <th><?php echo $lang->task->desc;?></th>
         <td colspan='3'><?php echo html::textarea('desc', $task->desc, "rows='10' class='form-control'");?></td>
       </tr>  
-      <?php
-      $hiddenEstStarted = strpos(",$showFields,", ',estStarted,') === false;
-      $hiddenDeadline   = strpos(",$showFields,", ',deadline,') === false;
-      $hiddenMailto     = strpos(",$showFields,", ',mailto,') === false;
-      ?>
+<?php
+            $hiddenEstStarted = strpos(",$showFields,", ',estStarted,') === false;
+            $hiddenDeadline   = strpos(",$showFields,", ',deadline,') === false;
+            $hiddenMailto     = strpos(",$showFields,", ',mailto,') === false;
+?>
       <?php if(!$hiddenEstStarted or !$hiddenDeadline or !$hiddenMailto):?>
       <tr>
         <th><?php echo ($hiddenEstStarted and $hiddenDeadline) ? $lang->task->mailto : $lang->task->datePlan;?></th>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 6bd1018044..238f91c295 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -94,8 +94,18 @@
             <div class='col-table'>
               <div class='input-group'>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->testcase->pri;?></span>
-                <?php $isAllNumberPri = is_numeric(join($lang->testcase->priList));?>
-                <?php if(!$isAllNumberPri):?>
+                <?php
+                $hasCustomPri = false;
+                foreach($lang->testcase->priList as $priKey => $priValue)
+                {
+                    if($priKey != $priValue)
+                    {
+                        $hasCustomPri = true;
+                        break;
+                    }
+                }
+                ?>
+                <?php if($hasCustomPri):?>
                 <?php echo html::select('pri', (array)$lang->testcase->priList, $pri, "class='form-control minw-80px'");?> 
                 <?php else: ?>
                 <div class='input-group-btn dropdown-pris'>

From aae2f9006932f39d65480a4c813451914c3527ce Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 20 May 2016 09:07:48 +0800
Subject: [PATCH 3/6]  * convert branch to int when import case.

---
 module/testcase/control.php | 2 +-
 module/testcase/model.php   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index c5229ab1a5..bc8bef37f3 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1091,7 +1091,7 @@ class testcase extends control
     {
         if($_POST)
         {
-            $this->testcase->createFromImport($productID, $branch);
+            $this->testcase->createFromImport($productID, (int)$branch);
             die(js::locate(inlink('browse', "productID=$productID"), 'parent'));
         }
 
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 6c29a6c977..b5b552cb7c 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -736,8 +736,9 @@ class testcaseModel extends model
         $this->loadModel('action');
         $this->loadModel('story');
         $this->loadModel('file');
-        $now  = helper::now();
-        $data = fixer::input('post')->get();
+        $now    = helper::now();
+        $branch = (int)$branch;
+        $data   = fixer::input('post')->get();
 
         if(!empty($_POST['id']))
         {

From 16f8c282020a7e3bcd98caf8adc6f4dab8e78155 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 23 May 2016 09:20:59 +0800
Subject: [PATCH 4/6]  * adjust power for block.

---
 module/block/view/dashboard.html.php | 12 +++---------
 module/common/model.php              |  3 ++-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php
index 808d69f0ee..71bf0df93a 100644
--- a/module/block/view/dashboard.html.php
+++ b/module/block/view/dashboard.html.php
@@ -33,11 +33,13 @@ if(isset($pageCSS)) css::internal($pageCSS);
               <a href='javascript:;' data-toggle='dropdown' class='panel-action'><i class='icon icon-ellipsis-v'></i></a>
               <ul class='dropdown-menu pull-right'>
                 <li><a href='javascript:;' class='refresh-panel'><i class='icon-repeat'></i> <?php echo $lang->block->refresh ?></a></li>
+                <?php if($this->app->user->account != 'guest'):?>
                 <li><a data-toggle='modal' href="<?php echo $this->createLink("block", "admin", "id=$block->id&module=$module"); ?>" class='edit-block' data-title='<?php echo $block->title; ?>' data-icon='icon-pencil'><i class='icon-pencil'></i> <?php echo $lang->edit; ?></a></li>
                 <?php if(!$block->source and $block->block == 'html'):?>
                 <li><a href="javascript:hiddenBlock(<?php echo $index;?>)" class="hidden-panel"><i class='icon-eye-close'></i><?php echo $lang->block->hidden; ?></a></li>
                 <?php endif;?>
                 <li><a href='javascript:;' class='remove-panel'><i class='icon-remove'></i> <?php echo $lang->delete; ?></a></li>
+                <?php endif;?>
               </ul>
             </div>
           </div>
@@ -56,12 +58,4 @@ config.confirmRemoveBlock = '<?php echo $lang->block->confirmRemoveBlock; ?>';
 var module = '<?php echo $module?>';
 </script>
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<?php 
-if(isset($pageJS)) js::execute($pageJS);
-
-/* Load hook files for current page. */
-$extPath      = dirname(dirname(dirname(realpath($viewFile)))) . '/common/ext/view/';
-$extHookRule  = $extPath . 'footer.*.hook.php';
-$extHookFiles = glob($extHookRule);
-if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile;
-?>
+<?php if(isset($pageJS)) js::execute($pageJS);?>
diff --git a/module/common/model.php b/module/common/model.php
index 19b2e4c709..e514f9453a 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -169,13 +169,14 @@ class commonModel extends model
         if($module == 'sso' and $method == 'bind') return true;
         if($module == 'sso' and $method == 'gettodolist') return true;
         if($module == 'product' and $method == 'showerrornone') return true;
-        if($module == 'block') return true;
+        if($module == 'block' and $method == 'printblock') return true;
 
         if($this->loadModel('user')->isLogon())
         {
             if(stripos($method, 'ajax') !== false) return true;
             if(stripos($method, 'downnotify') !== false) return true;
             if($module == 'tutorial') return true;
+            if($module == 'block') return true;
         }
 
         if(stripos($method, 'ajaxgetdropmenu') !== false) return true;

From d17beaf08ca0ebbdeb9b723d1def45b17dd0575b Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 23 May 2016 09:21:26 +0800
Subject: [PATCH 5/6]  * fix for check module unique.

---
 module/tree/model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/tree/model.php b/module/tree/model.php
index 430e4ea517..5499c69aec 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -1419,10 +1419,11 @@ class treeModel extends model
     public function checkUnique($rootID, $viewType, $parentModuleID, $modules = array(), $branches = array())
     {
         if(empty($branches)) $branches = $this->post->branch;
+        $branches = array_unique($branches);
 
         if($this->isMergeModule($rootID, $viewType)) $viewType .= ',story';
 
-        $existsModules = $this->dao->select('id,branch,name')->from(TABLE_MODULE)->where('root')->eq($rootID)->andWhere('type')->in($viewType)->andWhere('parent')->eq($parentModuleID)->fetchAll();
+        $existsModules = $this->dao->select('id,branch,name')->from(TABLE_MODULE)->where('root')->eq($rootID)->andWhere('type')->in($viewType)->andWhere('parent')->eq($parentModuleID)->andWhere('branch')->in($branches)->fetchAll();
         $repeatName    = '';
         foreach($modules as $id => $name)
         {

From cd8cd0b43c5931af6c42e78c897b1470e8b29cd5 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 23 May 2016 09:22:03 +0800
Subject: [PATCH 6/6]  * fix for get cookie branch.

---
 module/bug/control.php      |  8 ++++----
 module/product/control.php  |  6 +++---
 module/qa/control.php       |  2 +-
 module/testcase/control.php | 10 +++++-----
 module/testtask/control.php |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index d2c6acea50..8d29c3c216 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -66,9 +66,9 @@ class bug extends control
 
         /* Set productID, moduleID, queryID and branch. */
         $productID = $this->product->saveState($productID, $this->products);
-        $branch    = ($branch == '') ? $this->cookie->preBranch  : $branch;
+        $branch    = ($branch == '') ? (int)$this->cookie->preBranch  : (int)$branch;
         setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot);
-        setcookie('preBranch', $branch, $this->config->cookieLife, $this->config->webRoot);
+        setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot);
 
         if($this->cookie->preProductID != $productID or $this->cookie->preBranch != $branch)
         {
@@ -230,7 +230,7 @@ class bug extends control
 
         /* Get product, then set menu. */
         $productID = $this->product->saveState($productID, $this->products);
-        if($branch === '') $branch = $this->cookie->preBranch;
+        if($branch === '') $branch = (int)$this->cookie->preBranch;
         $branches  = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($productID);
         $this->bug->setMenu($this->products, $productID, $branch);
 
@@ -367,7 +367,7 @@ class bug extends control
 
         /* Get product, then set menu. */
         $productID = $this->product->saveState($productID, $this->products);
-        if($branch === '') $branch = $this->cookie->preBranch;
+        if($branch === '') $branch = (int)$this->cookie->preBranch;
         $this->bug->setMenu($this->products, $productID, $branch);
 
         /* If projectID is setted, get builds and stories of this project. */
diff --git a/module/product/control.php b/module/product/control.php
index f8509fb961..a290c4bbad 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -64,7 +64,7 @@ class product extends control
 
         unset($this->lang->product->menu->index);
         $productID = $this->product->saveState($productID, $this->products);
-        $branch    = $this->cookie->preBranch;
+        $branch    = (int)$this->cookie->preBranch;
         $this->product->setMenu($this->products, $productID, $branch);
 
         $this->view->title         = $this->lang->product->index;
@@ -121,9 +121,9 @@ class product extends control
 
         /* Set product, module and query. */
         $productID = $this->product->saveState($productID, $this->products);
-        $branch    = ($branch === '') ? $this->cookie->preBranch : $branch;
+        $branch    = ($branch === '') ? (int)$this->cookie->preBranch : (int)$branch;
         setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot);
-        setcookie('preBranch', $branch, $this->config->cookieLife, $this->config->webRoot);
+        setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot);
 
         if($this->cookie->preProductID != $productID or $this->cookie->preBranch != $branch)
         {
diff --git a/module/qa/control.php b/module/qa/control.php
index c4c9db729f..bab4ceb8b0 100644
--- a/module/qa/control.php
+++ b/module/qa/control.php
@@ -36,7 +36,7 @@ class qa extends control
 
         unset($this->lang->qa->menu->index);
         $productID = $this->product->saveState($productID, $this->products);
-        $branch    = $this->cookie->preBranch;
+        $branch    = (int)$this->cookie->preBranch;
         $this->qa->setMenu($this->products, $productID, $branch);
 
         $this->view->title      = $this->lang->qa->index;
diff --git a/module/testcase/control.php b/module/testcase/control.php
index bc8bef37f3..7b8a7dacdd 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -62,9 +62,9 @@ class testcase extends control
 
         /* Set browseType, productID, moduleID and queryID. */
         $productID  = $this->product->saveState($productID, $this->products);
-        $branch     = ($branch === '') ? $this->cookie->preBranch : $branch;
+        $branch     = ($branch === '') ? (int)$this->cookie->preBranch : (int)$branch;
         setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot);
-        setcookie('preBranch', $branch, $this->config->cookieLife, $this->config->webRoot);
+        setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot);
 
         if($this->cookie->preProductID != $productID or $this->cookie->preBranch != $branch)
         {
@@ -147,7 +147,7 @@ class testcase extends control
     {
         $groupBy   = empty($groupBy) ? 'stroy' : $groupBy;
         $productID = $this->product->saveState($productID, $this->products);
-        if($branch === '') $branch = $this->cookie->preBranch;
+        if($branch === '') $branch = (int)$this->cookie->preBranch;
 
         $this->app->loadLang('testtask');
 
@@ -228,7 +228,7 @@ class testcase extends control
 
         /* Set productID and currentModuleID. */
         $productID = $this->product->saveState($productID, $this->products);
-        if($branch === '') $branch = $this->cookie->preBranch;
+        if($branch === '') $branch = (int)$this->cookie->preBranch;
         if($storyID and empty($moduleID))
         {
             $story    = $this->loadModel('story')->getByID($storyID);
@@ -351,7 +351,7 @@ class testcase extends control
 
         /* Set productID and currentModuleID. */
         $productID = $this->product->saveState($productID, $this->products);
-        if($branch === '') $branch = $this->cookie->preBranch;
+        if($branch === '') $branch = (int)$this->cookie->preBranch;
         if($storyID and empty($moduleID))
         {
             $story    = $this->loadModel('story')->getByID($storyID);
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 8bcdefc5d4..909bc368d3 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -57,7 +57,7 @@ class testtask extends control
 
         /* Set menu. */
         $productID = $this->product->saveState($productID, $this->products);
-        if($branch === '') $branch = $this->cookie->preBranch;
+        if($branch === '') $branch = (int)$this->cookie->preBranch;
         $this->testtask->setMenu($this->products, $productID, $branch);
 
         /* Load pager. */