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

module/block/control.php

@@ -1304,11 +1304,22 @@ class block extends control
      */
     public function printScrumdynamicBlock()
     {
-        /* Load pager. */
-        $this->app->loadClass('pager', $static = true);
-        $pager = new pager(0, 30, 1);
+        $projects  = $this->loadModel('project')->getPairs();
+        $products  = $this->loadModel('product')->getPairs();
 
-        $this->view->actions = $this->loadModel('action')->getDynamic('all', 'today', 'date_desc', $pager);
+        $actions = array();
+        if(!empty($projects) || !empty($products))
+        {
+            $actions = $this->dao->select('*')->from(TABLE_ACTION)
+                ->beginIF($projects && $products)->where('project')->in(array_keys($projects))->orWhere('product')->in(array_keys($products))->fi()
+                ->beginIF($projects && empty($products))->where('project')->in(array_keys($projects))->fi()
+                ->beginIF(empty($projects) && $products)->where('product')->in(array_keys($products))->fi()
+                ->orderBy('id_desc')
+                ->limit(30)
+                ->fetchAll();
+        }
+
+        $this->view->actions = empty($actions) ? array() : $this->loadModel('action')->transformActions($actions);
         $this->view->users   = $this->loadModel('user')->getPairs('noletter');
     }
 

module/block/lang/zh-cn.php

@@ -119,9 +119,9 @@ $lang->block->default['cmmi']['program']['5']['params']['num']     = '15';
 $lang->block->default['cmmi']['program']['5']['params']['orderBy'] = 'id_desc';
 
 $lang->block->default['cmmi']['program']['6']['title']  = '最新动态';
-$lang->block->default['cmmi']['program']['6']['block']  = 'dynamic';
+$lang->block->default['cmmi']['program']['6']['block']  = 'scrumdynamic';
 $lang->block->default['cmmi']['program']['6']['grid']   = 4;
-$lang->block->default['cmmi']['program']['6']['source'] = '';
+$lang->block->default['cmmi']['program']['6']['source'] = 'program';
 
 $lang->block->default['cmmi']['program']['7']['title']  = '项目风险';
 $lang->block->default['cmmi']['program']['7']['block']  = 'cmmirisk';

module/block/view/cmmireportblock.html.php

@@ -9,7 +9,7 @@
 .block-cmmireport .col-right .tile .tile-title{font-weight: 700;}
 .block-cmmireport .progress {position: absolute; left: 45px; top: 90px; right: 40px;}
 .block-cmmireport .progress-num{font-size: 26px; font-weight: 700}
-.block-cmmireport .col-right .tile-amount{font-size: 26px; font-weight: 700}
+.block-cmmireport .col-right .tile-amount{font-size: 22px; font-weight: 700}
 </style>
 
 <div class="panel-move-handler"><span class='stage text-muted'><?php echo $current;?></span></div>

module/block/view/scrumroadmapblock.html.php

@@ -36,36 +36,30 @@
   <?php else:?>
   <div class="release-path">
     <ul class="release-line">
-      <?php foreach($roadmaps as $year => $mapBranches):?>
-        <?php foreach($mapBranches as $plans):?>
-          <?php foreach($plans as $plan):?>
-            <?php if(isset($plan->begin)):?>
-            <li <?php if(date('Y-m-d') < $plan->begin) echo 'class="active"';?>>
-              <a href="<?php echo $this->createLink('productplan', 'view', "planID={$plan->id}");?>">
-                <span class="title" title="<?php echo $plan->title;?>"><?php echo $plan->title;?></span>
-                <?php
-                  $plan->begin = date('Y/m/d', strtotime($plan->begin));
-                  $plan->end   = '-' . date('m/d', strtotime($plan->end));
-                ?>
-                <span class="date" title="<?php echo $plan->begin . $plan->end;?>"><?php echo $plan->begin . $plan->end;?></span>
-                <span class="date"><?php echo $lang->block->estimatedHours;?> <?php echo $plan->hour;?> h</span>
-              </a>
-            </li>
-            <?php else:?>
-            <li>
-              <a href="<?php echo $this->createLink('release', 'view', "releaseID={$plan->id}");?>">
-                <span class="title" title="<?php echo $plan->name;?>"><?php echo $plan->name . "($plan->buildName)";?></span>
-                <?php
-                  $plan->date = date('Y/m/d', strtotime($plan->date));
-                ?>
-                <span class="date" title="<?php echo $plan->date;?>"><?php echo $plan->date;?></span>
-                <?php $estimate = empty($plan->stories) ? 0 : $this->block->getStorysEstimateHours(explode(',', $plan->stories));?>
-                <span class="date"><?php echo $lang->block->consumedHours;?> <?php echo empty($estimate) ? 0 : $estimate;?> h</span>
-              </a>
-            </li>
-            <?php endif;?>
-          <?php endforeach;?>
-        <?php endforeach;?>
+      <?php foreach($roadmaps as $plan):?>
+        <?php if(isset($plan->begin)):?>
+        <li <?php if(date('Y-m-d') < $plan->begin) echo 'class="active"';?>>
+          <a href="<?php echo $this->createLink('productplan', 'view', "planID={$plan->id}");?>">
+            <span class="title" title="<?php echo $plan->title;?>"><?php echo $plan->title;?></span>
+            <?php
+              $plan->begin = date('Y/m/d', strtotime($plan->begin));
+              $plan->end   = '-' . date('m/d', strtotime($plan->end));
+            ?>
+            <span class="date" title="<?php echo $plan->begin . $plan->end;?>"><?php echo $plan->begin . $plan->end;?></span>
+            <span class="date"><?php echo $lang->block->estimatedHours;?> <?php echo $plan->hour;?> h</span>
+          </a>
+        </li>
+        <?php else:?>
+        <li>
+          <a href="<?php echo $this->createLink('release', 'view', "releaseID={$plan->id}");?>">
+            <span class="title" title="<?php echo $plan->name;?>"><?php echo $plan->name . "($plan->buildName)";?></span>
+            <?php $plan->date = date('Y/m/d', strtotime($plan->date));?>
+            <span class="date" title="<?php echo $plan->date;?>"><?php echo $plan->date;?></span>
+            <?php $estimate = empty($plan->stories) ? 0 : $this->block->getStorysEstimateHours(explode(',', $plan->stories));?>
+            <span class="date"><?php echo $lang->block->consumedHours;?> <?php echo empty($estimate) ? 0 : $estimate;?> h</span>
+          </a>
+        </li>
+        <?php endif;?>
       <?php endforeach;?>
     </ul>
   </div>

module/issue/control.php

@@ -117,7 +117,7 @@ class issue extends control
         else
         {
             $this->issue->delete($issueID);
-            die(js::reload('parent'));
+            die(js::locate(inLink('browse'), 'parent'));
         }
     }
 
@@ -306,7 +306,7 @@ class issue extends control
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
         }
 
-        $this->view->title = $this->lang->issue->resolved;
+        $this->view->title = $this->lang->issue->resolve;
         $this->view->issue = $this->issue->getByID($issue);
         $this->view->users = $this->loadModel('user')->getPairs('noletter');
 

module/issue/lang/en.php

@@ -27,15 +27,15 @@ $lang->issue->closedDate        = 'ClosedDate';
 $lang->issue->assignedTo        = 'AssignedTo';
 $lang->issue->assignedBy        = 'AssignedBy';
 $lang->issue->assignedDate      = 'AssignedDate';
-$lang->issue->resolved          = 'Resolved';
+$lang->issue->resolve           = 'Resolved';
 $lang->issue->id                = 'ID';
 
 $lang->issue->delete            = 'Delete';
 $lang->issue->search            = 'Search';
 $lang->issue->basicInfo         = 'Basic Information';
-$lang->issue->active            = 'Activate';
-$lang->issue->assign            = 'Assign';
-$lang->issue->create            = 'Create Issue';
+$lang->issue->activate          = 'Activate';
+$lang->issue->assignTo          = 'Assign';
+$lang->issue->create            = 'Create';
 $lang->issue->edit              = 'Edit';
 $lang->issue->batchCreate       = 'Batch Create';
 

module/issue/lang/zh-cn.php

@@ -27,24 +27,17 @@ $lang->issue->closedDate        = '关闭日期';
 $lang->issue->assignedTo        = '指派给';
 $lang->issue->assignedBy        = '由谁指派';
 $lang->issue->assignedDate      = '指派时间';
-$lang->issue->resolved          = '解决';
+$lang->issue->resolve           = '解决';
 $lang->issue->id                = '编号';
 
 $lang->issue->delete            = '删除';
 $lang->issue->search            = '搜索';
 $lang->issue->basicInfo         = '基本信息';
-$lang->issue->active            = '激活';
-$lang->issue->assign            = '指派';
-$lang->issue->assignTo          = '指派问题';
-$lang->issue->create            = '新建问题';
-$lang->issue->edit              = '编辑问题';
+$lang->issue->activate          = '激活';
+$lang->issue->assignTo          = '指派';
+$lang->issue->create            = '新建';
+$lang->issue->edit              = '编辑';
 $lang->issue->batchCreate       = '批量新建';
-$lang->issue->close             = '关闭问题';
-$lang->issue->cancel            = '取消问题';
-$lang->issue->activate          = '激活问题';
-$lang->issue->resolve           = '解决问题';
-$lang->issue->resolve           = '解决问题';
-$lang->issue->view              = '问题概况';
 
 $lang->issue->labelList['all']       = '全部';
 $lang->issue->labelList['open']      = '开放';

module/issue/view/browse.html.php

@@ -62,11 +62,11 @@
               <td title="<?php echo $issue->createdDate;?>"><?php echo $issue->createdDate;?></td>
               <td class="c-actions">
                 <?php
-                  echo common::printIcon('issue', 'resolve', "issueID=$issue->id", $issue, 'list', 'checked', '', 'iframe', 'yes', '', $lang->issue->resolved);
-                  echo common::printIcon('issue', 'assignTo', "issueID=$issue->id", $issue, 'list', 'hand-right', '', 'iframe', 'yes', '', $lang->issue->assignedTo);
+                  echo common::printIcon('issue', 'resolve', "issueID=$issue->id", $issue, 'list', 'checked', '', 'iframe', 'yes', '', $lang->issue->resolve);
+                  echo common::printIcon('issue', 'assignTo', "issueID=$issue->id", $issue, 'list', 'hand-right', '', 'iframe', 'yes', '', $lang->issue->assignTo);
                   echo common::printIcon('issue', 'close', "issueID=$issue->id", $issue, 'list', 'off', '', 'iframe', 'yes');
                   echo common::printIcon('issue', 'cancel', "issueID=$issue->id", $issue, 'list', 'ban-circle', '', 'iframe', 'yes');
-                  echo common::printIcon('issue', 'activate', "issueID=$issue->id", $issue, 'list', 'magic', '', 'iframe', 'yes', '', $lang->issue->active);
+                  echo common::printIcon('issue', 'activate', "issueID=$issue->id", $issue, 'list', 'magic', '', 'iframe', 'yes', '', $lang->issue->activate);
                   echo common::printIcon('issue', 'edit', "issueID=$issue->id", $issue, 'list', 'edit');
                   $deleteClass = common::hasPriv('issue', 'delete') ? 'btn' : 'btn disabled';
                   echo html::a($this->createLink('issue', 'delete', "issueID=$issue->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->issue->delete}' class='$deleteClass'");

module/issue/view/view.html.php

@@ -49,6 +49,24 @@ foreach($issue as $field => $value)
     </div>
     <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=issue&objectID=$issue->id");?>
     <div class="cell"><?php include '../../common/view/action.html.php';?></div>
+    <div class='main-actions'>
+      <div class="btn-toolbar">
+        <?php common::printBack($browseLink);?>
+        <?php if(!isonlybody()) echo "<div class='divider'></div>";?>
+        <?php if(!$issue->deleted):?>
+        <?php
+        common::printIcon('issue', 'resolve', "issueID=$issue->id", $issue, 'button', 'checked', '', 'showinonlybody');
+        common::printIcon('issue', 'assignTo', "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true);
+        common::printIcon('issue', 'cancel', "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true);
+        common::printIcon('issue', 'close',    "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true);
+        common::printIcon('issue', 'activate',    "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true);
+        echo "<div class='divider'></div>";
+        common::printIcon('issue', 'edit', "issueID=$issue->id", $issue);
+        common::printIcon('issue', 'delete', "issueID=$issue->id", $issue, 'button', 'trash', 'hiddenwin');
+        ?>  
+        <?php endif;?>
+      </div>
+    </div>
   </div>
   <div class="side-col col-4">
     <div class="cell">

module/program/view/create.html.php

@@ -143,7 +143,7 @@
             <?php echo html::backButton();?>
             <?php
             echo html::hidden('template', $template);
-            echo html::hidden('parent', $parentProgram->id);
+            echo html::hidden('parent', isset($parentProgram->id) ? $parentProgram->id : 0);
             ?>
           </td>
         </tr>
@@ -181,5 +181,5 @@
   </div>
 </div>
 <?php js::set('template', $template);?>
-<?php js::set('parentProgramID', $parentProgram->id);?>
+<?php js::set('parentProgramID', isset($parentProgram->id) ? $parentProgram->id : 0);?>
 <?php include '../../common/view/footer.html.php';?>

module/risk/control.php

@@ -178,7 +178,7 @@ class risk extends control
     public function delete($riskID, $confirm = 'no')
     {
         $risk = $this->risk->getById($riskID);
-                        
+
         if($confirm == 'no')
         {
             echo js::confirm($this->lang->risk->confirmDelete, $this->createLink('risk', 'delete', "risk=$riskID&confirm=yes"), '');