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

config/filter.php

@@ -175,7 +175,6 @@ $filter->program->ajaxgetpgmdropmenu->cookie['showClosed'] = 'code';
 $filter->project->default->cookie['lastProject']      = 'int';
 $filter->project->default->cookie['lastPRJ']          = 'int';
 $filter->project->default->cookie['projectMode']      = 'code';
-$filter->project->default->cookie['recentExecutions'] = 'code';
 $filter->project->story->cookie['storyModuleParam']   = 'int';
 $filter->project->story->cookie['storyPreProjectID']  = 'int';
 $filter->project->story->cookie['storyProductParam']  = 'int';
@@ -186,7 +185,6 @@ $filter->project->task->cookie['preProjectID']        = 'int';
 $filter->project->task->cookie['productBrowseParam']  = 'int';
 $filter->project->task->cookie['projectTaskOrder']    = 'reg::orderBy';
 $filter->project->task->cookie['windowWidth']         = 'int';
-$filter->project->task->cookie['recentExecutions'] = 'code';
 $filter->project->export->cookie['checkedItem']       = 'reg::checked';
 
 $filter->qa->default->cookie['lastProduct']  = 'int';

module/common/view/datatable.html.php

@@ -22,7 +22,7 @@
 .datatable .flexarea tbody>tr.checked>td:first-child:before,
 .datatable .fixed-right tbody>tr.checked>td:first-child:before {display: none}
 .datatable>.scroll-wrapper {z-index: 10;}
-.has-fixed-footer .scroll-wrapper {bottom: 89px; position: fixed;}
+.has-fixed-footer .scroll-wrapper {bottom: 49px; position: fixed;}
 .has-fixed-footer .scroll-wrapper .scroll-slide.scroll-pos-out{height:8px;bottom: -8px;}
 .has-fixed-footer .scroll-wrapper .scroll-slide.scroll-pos-out .bar{height:8px;}
 .datatable .flexarea thead>tr>th:first-child,

module/custom/control.php

@@ -507,8 +507,9 @@ class custom extends control
             $lang = $this->app->getClientLang();
             $this->custom->deleteItems("lang=$lang&section=URSRList&key=$key");
 
+            $defaultConcept = $this->loadModel('setting')->getItem('owner=system&module=custom&key=URSR');
             $this->dao->update(TABLE_CONFIG)
-                ->set('`value`')->eq($this->config->URSR)
+                ->set('`value`')->eq($defaultConcept)
                 ->where('module')->eq('common')
                 ->andWhere('`key`')->eq('URSR')
                 ->andWhere('`value`')->eq($key)

module/upgrade/view/mergebyproduct.html.php

@@ -1,4 +1,7 @@
-<style> #source .lineGroup .productList{width: 250px;} </style>
+<style>
+#source .lineGroup .productList{width: 250px; word-break: break-all;}
+.checkbox-primary > label{height: auto;}
+</style>
 <div class='alert alert-info'>
   <?php
   printf($lang->upgrade->mergeSummary, $noMergedProductCount, $noMergedSprintCount);
@@ -9,26 +12,28 @@
   <div class='table-col' id='source'>
     <div class='cell'>
       <div class='lineGroup-title'>
-        <div class='item'><strong><?php echo $lang->upgrade->product;?></strong></div>
+        <div class='item w-250px'><strong><?php echo $lang->upgrade->product;?></strong></div>
         <div class='item'><strong><?php echo $lang->upgrade->project;?></strong></div>
       </div>
       <div class='line-groups'>
+        <?php $isChecked = true;?>
         <?php foreach($noMergedProducts as $productID => $product):?>
         <div class='lineGroup'>
           <div class='productList'>
-            <?php echo html::checkBox("products", array($product->id => "{$lang->productCommon} #{$product->id} {$product->name}"), $product->id, "data-productid='{$product->id}' data-begin='{$product->createdDate}'");?>
+            <?php echo html::checkBox("products", array($product->id => "{$product->name}"), $isChecked ? $product->id : '', "data-productid='{$product->id}' data-begin='{$product->createdDate}'");?>
           </div>
           <div class='projectList'>
             <div class='scroll-handle'>
             <?php if(isset($productGroups[$productID])):?>
             <?php foreach($productGroups[$productID] as $sprint):?>
-            <?php echo html::checkBox("sprints[$productID]", array($sprint->id => "{$lang->upgrade->project} #{$sprint->id} {$sprint->name}"), $sprint->id, "data-product='{$productID}' data-begin='{$sprint->begin}' data-end='{$sprint->end}'");?>
+            <?php echo html::checkBox("sprints[$productID]", array($sprint->id => "{$sprint->name}"), $isChecked ? $sprint->id : '', "data-product='{$productID}' data-begin='{$sprint->begin}' data-end='{$sprint->end}'");?>
             <?php echo html::hidden("sprintIdList[$productID][$sprint->id]", $sprint->id);?>
             <?php endforeach;?>
             <?php endif;?>
             </div>
           </div>
         </div>
+        <?php $isChecked = false;?>
         <?php endforeach;?>
       </div>
     </div>