Merge branch 'sprint/179_tianshujie_17754' into 'master'

* Fix bug #17756,#17755,#17754,#17752,#17747.

See merge request easycorp/zentaopms!1031

module/common/lang/common.php

@@ -169,7 +169,7 @@ $lang->createIcons['execution']   = 'run';
 $lang->createIcons['project']     = 'project';
 $lang->createIcons['product']     = 'product';
 $lang->createIcons['program']     = 'program';
-$lang->createIcons['kanbanspace'] = 'zone';
+$lang->createIcons['kanbanspace'] = 'cube';
 $lang->createIcons['kanban']      = 'kanban';
 
 

module/kanban/css/createregion.css

@@ -0,0 +1 @@
+.radio-inline {margin-left: 10px !important;}

module/kanban/model.php

@@ -225,7 +225,7 @@ class kanbanModel extends model
         {
             $column = fixer::input('post')
                 ->add('region', $regionID)
-                ->add('parent', $parent)
+                ->setIF($parent > 0, 'parent', $parent)
                 ->setIF($order, 'order', $order)
                 ->setDefault('color', '#333')
                 ->trim('name')
@@ -252,7 +252,7 @@ class kanbanModel extends model
         $column->limit = (int)$column->limit;
 
         $limit = $column->limit;
-        if($column->parent > 0)
+        if(isset($column->parent) and $column->parent > 0)
         {
             /* Create a child column. */
             $parentColumn = $this->getColumnByID($column->parent);

module/kanban/view/createcolumn.html.php

@@ -31,11 +31,11 @@
           <td>
             <div class='required required-wrapper'></div>
             <div class='input-group'>
-              <?php echo html::input('WIPCount', $column->limit != -1 ? $column->limit : '', "class='form-control'" . ($column->limit > 0 ? '' : "disabled"));?>
-              <?php echo html::hidden('limit', $column->limit, "class='form-control'");?>
+              <?php echo html::input('WIPCount', '', "class='form-control' disabled");?>
+              <?php echo html::hidden('limit', -1, "class='form-control'");?>
               <span class='input-group-addon'>
                 <label class='checkbox-inline'>
-                  <input type='checkbox' name='noLimit' id='noLimit' value='-1' <?php if($column->limit == -1) echo "checked";?>/> <?php echo $this->lang->kanban->noLimit;?>
+                  <input type='checkbox' name='noLimit' id='noLimit' value='-1' checked/> <?php echo $this->lang->kanban->noLimit;?>
                 </label>
               </span>
             </div>
@@ -52,7 +52,7 @@
           <td colspan='2' class='form-actions text-center'>
             <?php echo html::hidden('color', '#333');?>
             <?php echo html::hidden('group', $column->group);?>
-            <?php echo html::hidden('parent', $column->parent);?>
+            <?php echo html::hidden('parent', $column->parent > 0 ? $column->parent : 0);?>
             <?php echo html::submitButton();?>
             <?php echo html::commonButton($lang->cancel, "data-dismiss='modal'", 'btn btn-wide');?>
           </td>

module/kanban/view/space.html.php

@@ -36,7 +36,7 @@
     <div class='space'>
       <div class='row menu'>
         <div class='spaceTitle pull-left'>
-          <div><i class='icon-zone'></i></div>
+          <div><i class='icon-cube'></i></div>
           <div>
             <h4>
               <?php if($space->status == 'closed'):?>