* Fix bug #20653.

module/kanban/control.php

@@ -867,6 +867,7 @@ class kanban extends control
         $this->view->card     = $card;
         $this->view->actions  = $this->action->getList('kanbancard', $cardID);
         $this->view->users    = $users;
+        $this->view->kanban   = $kanban;
 
         $this->display();
     }
@@ -1317,6 +1318,9 @@ class kanban extends control
      */
     public function viewArchivedCard($regionID)
     {
+        $region = $this->kanban->getRegionByID($regionID);
+
+        $this->view->kanban      = $this->kanban->getByID($region->kanban);
         $this->view->cards       = $this->kanban->getCardsByObject('region', $regionID, 1);
         $this->view->users       = $this->loadModel('user')->getPairs('noletter|nodeleted');
         $this->view->userIdPairs = $this->user->getPairs('noletter|nodeleted|showid');

module/kanban/view/editcard.html.php

@@ -71,7 +71,7 @@
                     </div>
                   </td>
                 </tr>
-                <?php if($card->progress):?>
+                <?php if($kanban->performable):?>
                 <tr>
                   <th><?php echo $lang->kanbancard->progress;?></th>
                   <td>

module/kanban/view/viewarchivedcard.html.php

@@ -25,6 +25,7 @@
 [lang^='en'] #archivedCards .card-actions > .btn {width: 55px;}
 #archivedCards .card-actions > .btn + .btn {margin-top: 10px;}
 #archivedCards .info > .time {background-color: rgba(0, 0, 0, 0.15);}
+#archivedCards .info > .users {padding-right: 10px;}
 #archivedCards .info > .users > span {display: inline-block; color: transparent; width: 2px; height: 2px; background-color: #8990a2; position:sticky; top: 3px; margin: 0 7px; border-radius: 50%; line-height: 32px;}
 #archivedCards .info > .users > span:before {left: -4px; content: ''; display: block; position: absolute; width: 2px; height: 2px; background-color: #8990a2; top: 0px; border-radius: 50%;}
 #archivedCards .info > .users > span:after {right: -4px; content: ''; display: block; position: absolute; width: 2px; height: 2px; background-color: #8990a2; top: 0px; border-radius: 50%;}
@@ -40,6 +41,8 @@
 #archivedCards .card-item .has-color .info > .estimate,
 #archivedCards .card-item .has-color .info > .label-light {color: #FFFFFF;}
 #archivedCards .card-item .has-color .info > .label-pri {border-color: #FFFFFF;}
+#archivedCards .progress-box {width: 97%;}
+#performable {padding: 25px 10px !important;}
 </style>
 <div class='panel'>
   <div class='panel-heading text-center'>
@@ -117,9 +120,17 @@
             </div>
             <?php endif;?>
           </div>
+          <?php if($kanban->performable):?>
+          <div class='progress-box'>
+            <div class='progress'>
+              <div class="progress-bar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo round($card->progress, 2) . ' %';?>"></div>
+            </div>
+            <div class='progress-number'><?php echo round($card->progress, 2) . ' %';?></div>
+          </div>
+          <?php endif;?>
         </div>
       </div>
-      <div class='col-xs-2 card-actions'>
+      <div class='col-xs-2 card-actions' <?php if($kanban->performable) echo "id='performable'";?>>
         <?php
         $canRestore = commonModel::hasPriv('kanban', 'restoreCard');
         $canDelete  = commonModel::hasPriv('kanban', 'deleteCard');

module/kanban/view/viewcard.html.php

@@ -114,7 +114,7 @@
                   <th><?php echo $lang->kanbancard->estimate;?></th>
                   <td><?php echo round($card->estimate, 2) . ' ' . $lang->kanbancard->lblHour;?></td>
                 </tr>
-                <?php if($card->progress):?>
+                <?php if($kanban->performable):?>
                 <tr>
                   <th><?php echo $lang->kanbancard->progress;?></th>
                   <td><?php echo round($card->progress, 2) . ' %';?></td>

module/productplan/model.php

@@ -449,7 +449,7 @@ class productplanModel extends model
                     $stories = $this->dao->select('*')->from(TABLE_STORY)->where("CONCAT(',', plan, ',')")->like("%,{$plan->parent},%")->fetchAll('id');
                     foreach($stories as $storyID => $story)
                     {
-                        $storyPlan = str_replace(",{$plan->parent},", ",$planID,", ",$storyPlan,");
+                        $storyPlan = str_replace(",{$plan->parent},", ",$planID,", ",$story->plan,");
                         $storyPlan = trim($storyPlan, ',');
 
                         $this->dao->update(TABLE_STORY)->set('plan')->eq($storyPlan)->where('id')->eq($storyID)->exec();

module/story/view/view.html.php

@@ -486,7 +486,7 @@
                       $class         = isonlybody() ? 'showinonlybody' : 'iframe';
                       echo "<li title='$task->name'>" . html::a($this->createLink('task', 'view', "taskID=$task->id", '', true), $taskInfo, '', "class=$class data-width='80%'");
                       $execution = isset($story->executions[$task->execution]) ? $story->executions[$task->execution] : '';
-                      $execName  = (isset($execution->type) and $execution->type == 'kanban' and isonlybody()) ? $executionName : html::a($this->createLink('execution', 'view', "executionID=$executionID"), $executionName, '', "class='text-muted'");
+                      $execName  = (isset($execution->type) and $execution->type == 'kanban' and isonlybody()) ? $executionName : html::a($this->createLink('execution', 'view', "executionID=$task->execution"), $executionName, '', "class='text-muted'");
                       echo $execName . '</li>';
                   }
               }