Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/mr/model.php

@@ -1504,4 +1504,18 @@ class mrModel extends model
         }
         return isset($errorMessage) ? $errorMessage : $message;
     }
+
+    /**
+     * Adjust the action clickable.
+     *
+     * @param  object $MR
+     * @param  string $action
+     * @access public
+     * @return void
+     */
+    public static function isClickable($MR, $action)
+    {
+        if($action == 'edit' and !$MR->synced) return false;
+        return true;
+    }
 }

module/mr/view/browse.html.php

@@ -85,7 +85,7 @@
           <td class='c-actions'>
             <?php
             common::printLink('mr', 'view',   "mr={$MR->id}", '<i class="icon icon-eye"></i>', '', "title='{$lang->mr->view}' class='btn btn-info'");
-            common::printLink('mr', 'edit',   "mr={$MR->id}", '<i class="icon icon-edit"></i>', '', "title='{$lang->mr->edit}' class='btn btn-info'");
+            common::printIcon('mr', 'edit',   "mr={$MR->id}", $MR, 'list');
             common::printLink('mr', 'diff',   "mr={$MR->id}", '<i class="icon icon-diff"></i>', '', "title='{$lang->mr->viewDiff}' class='btn btn-info'");
             common::printLink('mr', 'link',   "mr={$MR->id}", '<i class="icon icon-link"></i>', '', "title='{$lang->mr->link}' class='btn btn-info'" . ($MR->linkButton == false ? 'disabled' : ''));
             common::printLink('mr', 'delete', "mr={$MR->id}", '<i class="icon icon-trash"></i>', 'hiddenwin', "title='{$lang->mr->delete}' class='btn btn-info'");

module/productplan/css/view.css

@@ -27,3 +27,7 @@ ol, ul {padding-left: 20px;}
 
 #mainMenu .btn-link.disabled {color: #9e54ae; background: transparent; border-color:transparent;}
 #mainMenu .icon-checked, #mainMenu .icon-off, #mainMenu .icon-play, #mainMenu .icon-magic {margin-right: 3px;}
+
+#mainMenu .page-title {display: flex;}
+#mainMenu .btn-toolbar .page-title .label { top: 9px; margin-right: 10px; height: 16px;}
+#mainMenu .btn-toolbar .page-title .text {max-width: 434px; overflow: hidden; white-space:nowrap; margin-right: 6px;}

module/productplan/js/edit.js

@@ -70,7 +70,7 @@ function setPlanStatus()
     var status = $('#status').val();
     if(status != 'wait')
     {
-        $('#checkBox').closest('div').addClass('hidden')
+        $('#checkBox').closest('div').addClass('hidden');
         $('#future').val(0);
         $('#begin').closest('td').addClass('required');
         $('#end').closest('td').addClass('required');

module/productplan/js/view.js

@@ -44,6 +44,10 @@ function loadURL(url, type)
 
 $(function()
 {
+    /* Recalculate the maximum width of the title. */
+    var maxWidth = $('#mainMenu').width() - $('#actionsBox').width() - $('#mainMenu .btn-toolbar .page-title .label-info').width() - 177;
+    $('#mainMenu .btn-toolbar .page-title .text').css('max-width', maxWidth.toString() + 'px');
+
     if(link == 'true') showLink(planID, type, orderBy, param);
     var infoShowed = false;
     $('.nav.nav-tabs a[data-toggle="tab"]').on('shown.zui.tab', function(e)

module/productplan/view/batchedit.html.php

@@ -59,7 +59,7 @@
           <?php if($plan->end == '2030-01-01') $plan->end = '';?>
           <td class=<?php echo $required;?>><?php echo html::input("begin[$plan->id]", $plan->begin, "class='form-control form-date' $disabled");?></td>
           <td class=<?php echo $required;?>><?php echo html::input("end[$plan->id]", $plan->end, "class='form-control form-date' $disabled");?></td>
-          <?php $hidden = ($plan->status != 'wait' and $plan->parent != -1) ? 'hidden' : '';?>
+          <?php $hidden = ($plan->status != 'wait') ? 'hidden' : '';?>
           <td><div class='checkbox-primary <?php echo $hidden;?>'><input type='checkbox' id="future<?php echo $plan->id; ?>" name='future[<?php echo $plan->id; ?>]' <?php echo $isChecked;?> onclick="changeDate(<?php echo $plan->id;?>);"/><label for='future<?php echo $plan->id; ?>'><?php echo $lang->productplan->future;?></label></div></td>
           <?php foreach($extendFields as $extendField) echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, $plan, $extendField->field . "[{$plan->id}]") . "</td>";?>
         </tr>

module/productplan/view/view.html.php

@@ -36,7 +36,7 @@
       <?php endif; ?>
     </div>
   </div>
-  <div class='btn-toolbar pull-right'>
+  <div class='btn-toolbar pull-right' id='actionsBox'>
     <?php
     if(!$plan->deleted && !isonlybody())
     {