* Fix bug #17928.

module/kanban/control.php

@@ -583,17 +583,17 @@ class kanban extends control
      */
     public function viewArchivedColumn($regionID)
     {
-        $columns     = $this->kanban->getColumnsByObject('region', $regionID, '', '');
+        $columns     = $this->kanban->getColumnsByObject('region', $regionID, '');
         $columnsData = array();
         foreach($columns as $column)
         {
             if($column->archived == 0) continue;
-            if($column->parent > 0)
+            if($column->parent > 0 and isset($columns[$column->parent]))
             {
                 if(empty($columnsData[$column->parent])) $columnsData[$column->parent] = $columns[$column->parent];
                 $columnsData[$column->parent]->child[$column->id] = $column;
             }
-            else
+            elseif($column->parent <= 0)
             {
                 if(empty($columnsData[$column->id])) $columnsData[$column->id] = $column;
             }

module/kanban/js/view.js

@@ -132,7 +132,7 @@ function renderHeaderCol($column, column, $header, kanbanData)
     var groupID      = $column.closest('.kanban-board').data('id');
     var laneID       = column.$kanbanData.lanes[0].id ? column.$kanbanData.lanes[0].id : 0;
     var columnID     = $column.closest('.kanban-col').data('id');
-    var printMoreBtn = (columnPrivs.includes('editColumn') || columnPrivs.includes('setWIP') || columnPrivs.includes('createColumn') || columnPrivs.includes('copyColumn') || columnPrivs.includes('archiveColumn') || columnPrivs.includes('deleteColumn') || columnPrivs.includes('splitColumn'));
+    var printMoreBtn = (columnPrivs.includes('setColumn') || columnPrivs.includes('setWIP') || columnPrivs.includes('createColumn') || columnPrivs.includes('copyColumn') || columnPrivs.includes('archiveColumn') || columnPrivs.includes('deleteColumn') || columnPrivs.includes('splitColumn'));
 
     /* Render more menu. */
     if(columnPrivs.includes('createCard') || printMoreBtn)
@@ -745,10 +745,9 @@ function createColumnMenu(options)
     if(!privs.length) return [];
 
     var items = [];
-    if(privs.includes('editColumn')) items.push({label: kanbanLang.editColumn, icon: 'edit', url: createLink('kanban', 'setColumn', 'columnID=' + column.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal'}});
+    if(privs.includes('setColumn')) items.push({label: kanbanLang.editColumn, icon: 'edit', url: createLink('kanban', 'setColumn', 'columnID=' + column.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal'}});
     if(privs.includes('setWIP')) items.push({label: kanbanLang.setWIP, icon: 'alert', url: createLink('kanban', 'setWIP', 'columnID=' + column.id), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width' : '500px'}});
     if(privs.includes('splitColumn')) items.push({label: kanbanLang.splitColumn, icon: 'col-split', url: createLink('kanban', 'splitColumn', 'columnID=' + column.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal'}});
-    if(privs.includes('setColumn')) items.push({label: kanbanLang.editColumn, icon: '', url: createLink('kanban', 'setColumn', 'columnID=' + column.id + '&executionID=0&from=kanban', '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal'}});
     if(privs.includes('createColumn'))
     {
         items.push({label: kanbanLang.createColumnOnLeft, icon: 'col-add-left', url: createLink('kanban', 'createColumn', 'columnID=' + column.id + '&position=left'), className: 'iframe', attrs: {'data-toggle': 'modal'}});

module/kanban/lang/en.php

@@ -288,6 +288,7 @@ $lang->kanbancard->deadlineAB      = 'DL';
 $lang->kanbancard->beginAB         = 'Begin';
 $lang->kanbancard->to              = '~';
 $lang->kanbancard->archived        = 'Archived';
+$lang->kanbancard->empty           = 'No Card';
 
 $lang->kanbancard->confirmArchive    = 'Are you sure to archive this card? After archiving the card, it will be hidden from the column and you can view it in the Region - Archived.';
 $lang->kanbancard->confirmDelete     = 'Are you sure to delete this card? After deleting the card, it will be deleted from the Kanban. You can only view it in the system recycle bin.';

module/kanban/lang/zh-cn.php

@@ -288,6 +288,7 @@ $lang->kanbancard->deadlineAB      = '截止';
 $lang->kanbancard->beginAB         = '开始';
 $lang->kanbancard->to              = '~';
 $lang->kanbancard->archived        = '已归档';
+$lang->kanbancard->empty           = '暂时没有卡片';
 
 $lang->kanbancard->confirmArchive    = '您确认归档该卡片吗？归档卡片后，该卡片将从列中隐藏，您可以在区域-已归档中查看。';
 $lang->kanbancard->confirmDelete     = '您确认删除该卡片吗？删除卡片后，该卡片将从看板中删除，您只能通过系统回收站查看。';

module/kanban/model.php

@@ -608,7 +608,7 @@ class kanbanModel extends model
             ->orderBy($order)
             ->fetchGroup('group');
 
-        $actions = array('createColumn', 'editColumn', 'setWIP', 'archiveColumn', 'restoreColumn', 'deleteColumn', 'createCard', 'splitColumn');
+        $actions = array('createColumn', 'setColumn', 'setWIP', 'archiveColumn', 'restoreColumn', 'deleteColumn', 'createCard', 'splitColumn');
 
         /* Group by parent. */
         $parentColumnGroup = array();
@@ -2188,7 +2188,7 @@ class kanbanModel extends model
      * @access public
      * @return array
      */
-    public function getColumnsByObject($objectType = '', $objectID = 0, $archived = 0, $deleted = 0)
+    public function getColumnsByObject($objectType = '', $objectID = 0, $archived = 0, $deleted = '0')
     {
         return $this->dao->select('*')->from(TABLE_KANBANCOLUMN)
             ->where(true)

module/kanban/view/viewarchivedcard.html.php

@@ -45,6 +45,11 @@
     <button type="button" class="close" aria-hidden="true">×</button>
   </div>
   <div class='panel-body'>
+    <?php if(empty($columns)):?>
+    <div class="table-empty-tip">
+      <p><span class="text-muted"><?php echo $lang->kanbancard->empty;?></span></p>
+    </div>
+    <?php else:?>
     <?php foreach($cards as $card):?>
     <div class='card-item' data-card='<?php echo $card->id;?>'>
       <div class='col-xs-10'>
@@ -113,6 +118,7 @@
       </div>
     </div>
     <?php endforeach;?>
+    <?php endif;?>
   </div>
 </div>
 <script>

module/kanban/view/viewarchivedcolumn.html.php

@@ -26,7 +26,7 @@
     <button type="button" class="close" aria-hidden="true">×</button>
   </div>
   <div class='panel-body'>
-  <?php if(empty($columns)):?>
+    <?php if(empty($columns)):?>
     <div class="table-empty-tip">
       <p><span class="text-muted"><?php echo $lang->kanbancolumn->empty;?></span></p>
     </div>