* fix error.

module/project/control.php

@@ -2139,13 +2139,8 @@ class project extends control
             $data = fixer::input('post')->get();
             if(common::hasPriv('project', 'kanbanHideCols'))
             {
-                $allCols = array();
-                if(isset($this->config->project->kanbanSetting->allCols))
-                {
-                    $allCols = json_decode($this->config->project->kanbanSetting->allCols, true);
-                }
-                $allCols[$projectID] = $data->allCols;
-                $this->setting->setItem("system.project.kanbanSetting.allCols", json_encode($allCols));
+                $allCols = $data->allCols;
+                $this->setting->setItem("system.project.kanbanSetting.allCols", $allCols);
             }
 
             $account = $this->app->user->account;

module/project/css/kanban.css

@@ -78,7 +78,7 @@ table th.col-closed {width:14%}
 .board-story.stage-tested     {color:#827717; background-color: #F9FBE7}
 .board-story.stage-released   {color:#9C27B0; background-color: #F3E5F5}
 
-.board-story.inverse {background: #dd7503}
+.board-story.inverse {background: #dd7503; color:#f1f1f1}
 .board-story.stage-projected.inverse  {background-color:#777;}
 .board-story.stage-developing.inverse {background-color:#D2322D;}
 .board-story.stage-developed.inverse  {background-color:#229F24;}

module/project/model.php

@@ -2243,16 +2243,9 @@ class projectModel extends model
     {
         $allCols    = '1';
         $showOption = '0';
-        if(isset($this->config->project->kanbanSetting->allCols))
-        {
-            $allColPairs = json_decode($this->config->project->kanbanSetting->allCols, true);
-            if(isset($allColPairs[$projectID])) $allCols = $allColPairs[$projectID];
-        }
+        if(isset($this->config->project->kanbanSetting->allCols)) $allCols = $this->config->project->kanbanSetting->allCols;
 
-        if(isset($this->config->project->kanbanSetting->showOption))
-        {
-            $showOption = $this->config->project->kanbanSetting->showOption;
-        }
+        if(isset($this->config->project->kanbanSetting->showOption)) $showOption = $this->config->project->kanbanSetting->showOption;
 
         $colorList = $this->config->project->kanbanSetting->colorList;
         if(!is_array($colorList)) $colorList = json_decode($colorList, true);

module/project/view/kanban.html.php

@@ -54,18 +54,9 @@ $account = $this->app->user->account
           <div class='actions'>
             <div class="dropdown">
               <button type="button" class="btn btn-mini btn-link dropdown-toggle" data-toggle="dropdown">
-                <span class="icon-ellipsis-v"></span>
+                <span class="icon-ellipsis-h"></span>
               </button>
               <ul class="dropdown-menu pull-right">
-                <?php
-                echo "<li class='dropdown-submenu'>";
-                echo "<a href='###'><i class='icon-group'></i> {$lang->project->groups['']}</a>";
-                echo "<ul class='dropdown-menu pull-left' style='width:105px'>";
-                echo "<li>" . html::a(inlink('kanban', "project=$projectID&type=story"), $lang->project->groups['story']) . "</li>";
-                echo "<li>" . html::a(inlink('kanban', "project=$projectID&type=assignedTo"), $lang->project->groups['assignedTo']) . "</li>";
-                echo "<li>" . html::a(inlink('kanban', "project=$projectID&type=finishedBy"), $lang->project->groups['finishedBy']) . "</li>";
-                echo "</ul></li>";
-                ?>
                 <?php echo '<li>' . html::a($this->createLink('project', 'ajaxKanbanSetting', "projectID=$projectID"), "<i class='icon-cog'></i> " .  $lang->project->kanbanSetting, '', "class='iframe'") . '</li>';?>
                 <?php if(common::hasPriv('project', 'printKanban')) echo '<li>' . html::a('###', "<i class='icon-print'></i> " .  $lang->project->printKanban, '', "id='printKanban' title='" . $lang->project->printKanban . "'") . '</li>';?>
               </ul>
@@ -102,7 +93,7 @@ $account = $this->app->user->account
                 <button type='button' class='btn btn-mini btn-link btn-info-toggle'><i class='icon-angle-down'></i></button>
                 <div class='dropdown'>
                   <button type='button' class='btn btn-mini btn-link dropdown-toggle' data-toggle='dropdown'>
-                    <span class='icon-ellipsis-v'></span>
+                    <span class='icon-ellipsis-h'></span>
                   </button>
                   <div class='dropdown-menu' style='left:-30px;width:80px'>
                     <?php
@@ -152,7 +143,7 @@ $account = $this->app->user->account
                 <button type='button' class='btn btn-mini btn-link btn-info-toggle'><i class='icon-angle-down'></i></button>
                 <div class='dropdown'>
                   <button type='button' class='btn btn-mini btn-link dropdown-toggle' data-toggle='dropdown'>
-                    <span class='icon-ellipsis-v'></span>
+                    <span class='icon-ellipsis-h'></span>
                   </button>
                   <div class='dropdown-menu' style='left:-15px'>
                     <?php
@@ -193,7 +184,7 @@ $account = $this->app->user->account
                 <button type='button' class='btn btn-mini btn-link btn-info-toggle'><i class='icon-angle-down'></i></button>
                 <div class='dropdown'>
                   <button type='button' class='btn btn-mini btn-link dropdown-toggle' data-toggle='dropdown'>
-                    <span class='icon-ellipsis-v'></span>
+                    <span class='icon-ellipsis-h'></span>
                   </button>
                   <div class='dropdown-menu' style='left:-15px'>
                     <?php

module/testsuite/model.php

@@ -700,7 +700,7 @@ class testsuiteModel extends model
                 $caseData->version    = 1;
                 $caseData->openedBy   = $this->app->user->account;
                 $caseData->openedDate = $now;
-                $caseData->status     = $forceNotReview ? 'wait' : 'normal';
+                $caseData->status     = $forceNotReview ? 'normal' : 'wait';
                 $this->dao->insert(TABLE_CASE)->data($caseData)->autoCheck()->exec();
 
                 if(!dao::isError())

module/testsuite/view/createcase.html.php

@@ -66,6 +66,9 @@
               <div class='input-group w-p100'>
                 <input type='hidden' id='color' name='color' data-provide='colorpicker' data-wrapper='input-group-btn' data-pull-menu-right='false' data-btn-tip='<?php echo $lang->testcase->colorTag ?>' data-update-text='#title'>
                 <?php echo html::input('title', $caseTitle, "class='form-control' autocomplete='off'");?>
+                <?php if(!$this->loadModel('testcase')->forceNotReview()):?>
+                <span class='input-group-addon'><?php echo html::checkbox('forceNotReview', $lang->testcase->forceNotReview, '', "id='forceNotReview'");?></span>
+                <?php endif;?>
               </div>
             </div>
             <div class='col-table'>

module/tutorial/model.php

@@ -211,7 +211,7 @@ class tutorialModel extends model
         $member->hours       = 7.0;
         $member->totalHours  = 70.0;
         $member->realname    = $this->app->user->realname;
-        $member->limitedUser = 0;
+        $member->limitedUser = 'no';
         return array($member->account => $member);
     }