* Fix bug #17704,17740,17694.

module/common/model.php

@@ -505,10 +505,12 @@ class commonModel extends model
             if($config->systemMode == 'classic' and $objectType == 'execution') $objectIcon = 'project';
 
             $createMethod = 'create';
+            $module       = $objectType == 'kanbanspace' ? 'kanban' : $objectType;
             if($objectType == 'effort') $createMethod = 'batchCreate';
+            if($objectType == 'kanbanspace') $createMethod = 'createSpace';
             if(strpos('|bug|execution|kanbanspace|', "|$objectType|") !== false) $needPrintDivider = true;
 
-            if(common::hasPriv($objectType, $createMethod))
+            if(common::hasPriv($module, $createMethod))
             {
                 if($objectType == 'doc' and !common::hasPriv('doc', 'tableContents')) continue;
 
@@ -567,9 +569,8 @@ class commonModel extends model
                         $params = "parentProgramID=0&extra=from=global";
                         break;
                     case 'kanbanspace':
-                        $createMethod = 'createSpace';
-                        $isOnlyBody   = true;
-                        $attr         = "class='iframe' data-width='75%'";
+                        $isOnlyBody = true;
+                        $attr       = "class='iframe' data-width='75%'";
                         break;
                     case 'kanban':
                         $isOnlyBody = true;
@@ -577,8 +578,7 @@ class commonModel extends model
                         break;
                 }
 
-                $module = $objectType == 'kanbanspace' ? 'kanban' : $objectType;
-                $html  .= '<li>' . html::a(helper::createLink($module, $createMethod, $params, '', $isOnlyBody), "<i class='icon icon-$objectIcon'></i> " . $lang->createObjects[$objectType], '', $attr) . '</li>';
+                $html .= '<li>' . html::a(helper::createLink($module, $createMethod, $params, '', $isOnlyBody), "<i class='icon icon-$objectIcon'></i> " . $lang->createObjects[$objectType], '', $attr) . '</li>';
             }
         }
 

module/kanban/css/view.css

@@ -36,7 +36,7 @@ body {background-color: #fff}
 .region .kanban-header-col > .title > span {display: inline-block; overflow: hidden; padding-right:2px; position: initial;}
 .region .kanban-header-col > .title > .text-grey {opacity: .5; font-weight: bold; color: #8b91a2;}
 .region .kanban-header-col > .title > .count {opacity: .5; font-weight: bold; color: #8b91a2;}
-.region .kanban-header-col > .title > .error {color: #333333; padding-left: 5px}
+.region .kanban-header-col > .title > .error {color: #333333; padding-left: 5px; font-size: 10px; padding-top: 1px;}
 .region .kanban-header-col > .actions {position: relative; right: -30px;}
 .region .kanban-header-parent-col > .actions {position: absolute; right: 0px;}
 .region .kanban-header-sub-cols .actions {position: absolute; right: 0px;}

module/kanban/view/editcard.html.php

@@ -66,10 +66,6 @@
                   <th><?php echo $lang->kanbancard->pri;?></th>
                   <td><?php echo html::select('pri', $lang->kanbancard->priList, $card->pri, "class='form-control'");?></td>
                 </tr>
-                <tr>
-                  <th><?php echo $lang->kanbancard->estimate;?></th>
-                  <td><?php echo html::input('estimate', $card->estimate, "class='form-control'");?></td>
-                </tr>
               </table>
             </div>
           </div>

module/story/model.php

@@ -170,10 +170,10 @@ class storyModel extends model
     public function getRequierements($productID)
     {
         return $this->dao->select('id,title')->from(TABLE_STORY)
+           ->where('deleted')->eq(0)
            ->andWhere('product')->eq($productID)
            ->andWhere('type')->eq('requirement')
            ->andWhere('status')->notIN('draft,closed')
-           ->where('deleted')->eq(0)
            ->fetchPairs();
     }