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

module/action/view/trash.html.php

@@ -21,8 +21,8 @@
   </div>
 </div>
 
-<div id='mainContent' class='main-content'>
-  <div class='main-table'>
+<div id='mainContent'>
+  <div class='main-table' data-ride='table'>
     <table class='table has-sort-head'>
       <?php $vars = "type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
       <thead>
@@ -38,7 +38,7 @@
       <tbody>
         <?php foreach($trashes as $action):?>
         <?php $module = $action->objectType == 'case' ? 'testcase' : $action->objectType;?>
-        <tr class='text-center'>
+        <tr>
           <td><?php echo zget($lang->action->objectTypes, $action->objectType, '');?></td>
           <td><?php echo $action->objectID;?></td>
           <td class='text-left'>

module/bug/view/view.html.php

@@ -336,8 +336,6 @@ $convertParams = "productID=$productID&branch=$bug->branch&moduleID=0&from=bug&b
     common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy');
     common::printIcon('bug', 'delete', $params, $bug, 'button', '', 'hiddenwin');
     ?>
-    <?php else:?>
-    <?php common::printBack($browseLink);?>
     <?php endif;?>
   </div>
 </div>

module/project/view/view.html.php

@@ -289,10 +289,6 @@
         common::printIcon('project', 'edit', $params, $project);
         common::printIcon('project', 'delete', $params, $project, 'button', '', 'hiddenwin');
     }
-    else
-    {
-        common::printBack($browseLink);
-    }
     ?>
   </div>
 <script>

module/score/model.php

@@ -93,7 +93,7 @@ class scoreModel extends model
 
                     if(!empty($task->estimate))
                     {
-                        $rule['score'] = $rule['score'] + round(($task->consumed / 10 * $task->estimate / $task->consumed));
+                        $rule['score'] = $rule['score'] + (empty($task->consumed) ? 0 : round($task->consumed / 10 * $task->estimate / $task->consumed));
                     }
                 }
                 break;
@@ -221,7 +221,7 @@ class scoreModel extends model
         $data->time     = empty($time) ? helper::now() : $time;
         $this->dao->insert(TABLE_SCORE)->data($data)->exec();
 
-        $this->dao->update(TABLE_USER)->set("`score`=`score` + " . (int)$rule['score'])->set("`scoreLevel`=`scoreLevel` + " . $rule['score'])->where('account')->eq($account)->exec();
+        $this->dao->update(TABLE_USER)->set("`score`=`score` + " . (int)$rule['score'])->set("`scoreLevel`=`scoreLevel` + " . (int)$rule['score'])->where('account')->eq($account)->exec();
     }
 
     /**

module/story/lang/en.php

@@ -96,6 +96,7 @@ $lang->story->copy           = "Copy a Story";
 $lang->story->total          = "Total Stories";
 $lang->story->allStories     = 'All';
 $lang->story->unclosed       = 'Unclosed';
+$lang->story->deleted        = 'Deleted';
 
 $lang->story->ditto       = 'Ditto';
 $lang->story->dittoNotice = 'This Story does not belong to the same Product as the last Story does!';

module/story/lang/zh-cn.php

@@ -96,6 +96,7 @@ $lang->story->copy           = "复制需求";
 $lang->story->total          = '总需求';
 $lang->story->allStories     = '所有需求';
 $lang->story->unclosed       = '未关闭';
+$lang->story->deleted        = '已删除';
 
 $lang->story->ditto       = '同上';
 $lang->story->dittoNotice = '该需求与上一需求不属于同一产品！';

module/story/view/view.html.php

@@ -36,7 +36,10 @@
         </ul>
       </small>
       <?php endif; ?>
-	</div>
+      <?php if($story->deleted):?>
+      <span class='label label-danger'><?php echo $lang->story->deleted;?></span>
+      <?php endif; ?>
+    </div>
   </div>
 </div>
 <div id="mainContent" class="main-row">

module/task/view/view.html.php

@@ -365,8 +365,6 @@
   
     if(!empty($task->parent)) echo html::a(helper::createLink('task', 'view', "taskID=$task->parent"), "<i class='icon icon-chevron-double-up'></i>", '', "class='btn btn-link' title='{$lang->task->parent}'");
     ?>
-    <?php else:?>
-    <?php common::printBack($browseLink);?>
     <?php endif;?>
   </div>
 </div>