Merge branch 'master' of github.com:easysoft/zentaopms

module/bug/control.php

@@ -193,7 +193,7 @@ class bug extends control
                 $chartFunc   = 'getDataOf' . $chart;
                 $chartData   = $this->bug->$chartFunc();
                 $chartOption = $this->lang->bug->report->$chart;
-                if(!empty($chartType)) $chartOption->type = $chartType;
+                if(!empty($chartType) and $chartType != 'default') $chartOption->type = $chartType;
                 $this->bug->mergeChartOption($chart);
 
                 $this->view->charts[$chart] = $chartOption;

module/product/view/view.html.php

@@ -15,6 +15,8 @@
 <div id='mainContent' class="main-row">
   <div class="col-8 main-col">
     <div class="row">
+    <?php $isRoadmap = common::hasPriv('product', 'roadmap');?>
+    <?php if($isRoadmap):?>
       <div class="col-sm-6">
         <div class="panel block-release">
           <div class="panel-heading">
@@ -50,7 +52,8 @@
           </div>
         </div>
       </div>
-      <div class="col-sm-6">
+      <?php endif;?>
+<div class="col-sm-<?php echo $isRoadmap ? 6 : 12?>">
         <div class="panel block-dynamic">
           <div class="panel-heading">
           <div class="panel-title"><?php echo $lang->product->latestDynamic;?></div>

module/task/control.php

@@ -1212,9 +1212,8 @@ class task extends control
                 $chartFunc   = 'getDataOf' . $chart;
                 $chartData   = $this->task->$chartFunc();
                 $chartOption = $this->lang->task->report->$chart;
-                if(!empty($chartType)) $chartOption->type = $chartType;
+                if(!empty($chartType) and $chartType != 'default') $chartOption->type = $chartType;
                 $this->task->mergeChartOption($chart);
-
                 $this->view->charts[$chart] = $chartOption;
                 $this->view->datas[$chart]  = $this->report->computePercent($chartData);
             }