diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 19713656b4..600905ed53 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -144,6 +144,7 @@ $lang->action->label->changestatus        = 'Change Status';
 $lang->action->label->marked              = 'Marked';
 $lang->action->label->linked2project      = "Link {$lang->projectCommon}";
 $lang->action->label->unlinkedfromproject = "Unlink {$lang->projectCommon}";
+$lang->action->label->unlinkedfrombuild   = "Unlink Build";
 $lang->action->label->linked2release      = "Link Release";
 $lang->action->label->unlinkedfromrelease = "Unlink Release";
 $lang->action->label->linkrelatedbug      = "Link to Bug";
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index e6671d8b99..f9f560a409 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -144,6 +144,7 @@ $lang->action->label->changestatus        = '修改状态';
 $lang->action->label->marked              = '编辑了';
 $lang->action->label->linked2project      = "关联{$lang->projectCommon}";
 $lang->action->label->unlinkedfromproject = "移除{$lang->projectCommon}";
+$lang->action->label->unlinkedfrombuild   = "移除版本";
 $lang->action->label->linked2release      = "关联发布";
 $lang->action->label->unlinkedfromrelease = "移除发布";
 $lang->action->label->linkrelatedbug      = "关联了相关Bug";
diff --git a/module/block/view/dynamic.html.php b/module/block/view/dynamic.html.php
index 663c37cde0..6e85881708 100644
--- a/module/block/view/dynamic.html.php
+++ b/module/block/view/dynamic.html.php
@@ -3,7 +3,7 @@
   foreach($actions as $action)
   {
       $user = isset($users[$action->actor]) ? $users[$action->actor] : $action->actor;
-      if($action->action == 'login' or $action->action == 'logout') $action->objectName = $action->objectLabel = '';
+      if($action->action == 'login' or $action->action == 'logout' or empty($action->objectLink)) $action->objectName = $action->objectLabel = '';
       echo "<tr><td class='nobr' width='100%'>";
       printf($lang->block->dynamicInfo, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName);
       echo "</td></tr>";
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index dea76e57f5..f5bde201ae 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -91,7 +91,7 @@ js::set('browseType', $browseType);
                 }
                 else
                 {
-                    echo '<li>' . html::a('javascript:;', $lang->task->moduleAB, '', $class) . '</li>';
+                    echo '<li>' . html::a('javascript:;', $lang->task->moduleAB, '', $misc) . '</li>';
                 }
 
                 /* Batch assign. */
diff --git a/module/testreport/control.php b/module/testreport/control.php
index 9c975bff6d..bf4c75de3b 100644
--- a/module/testreport/control.php
+++ b/module/testreport/control.php
@@ -134,7 +134,7 @@ class testreport extends control
             else
             {
                 $build   = $this->build->getById($task->build);
-                $stories = $this->story->getByList($build->stories);
+                $stories = empty($build->stories) ? array() : $this->story->getByList($build->stories);
 
                 $builds[$build->id] = $build;
                 $bugs = $this->testreport->getBugs4Test($builds, $productID, $begin, $end);
@@ -266,7 +266,7 @@ class testreport extends control
             else
             {
                 $build   = $this->build->getById($task->build);
-                $stories = $this->story->getByList($build->stories);
+                $stories = empty($build->stories) ? array() : $this->story->getByList($build->stories);
 
                 $builds[$build->id] = $build;
                 $bugs = $this->testreport->getBugs4Test($builds, $report->product, $report->begin, $report->end);
diff --git a/module/upgrade/view/afterexec.html.php b/module/upgrade/view/afterexec.html.php
index e61728fa1b..64e5e643ba 100644
--- a/module/upgrade/view/afterexec.html.php
+++ b/module/upgrade/view/afterexec.html.php
@@ -60,16 +60,19 @@ function updateFile(link)
     {
         if(response.result == 'finished')
         {
-			$('#resultBox li span.' + response.type + '-num').html(num + response.count);
-			updateFileFinish = true;
+            $('#resultBox li span.' + response.type + '-num').html(num + response.count);
+            updateFileFinish = true;
             $('#resultBox').append("<li class='text-success'>" + response.message + "</li>");
-			<?php
-			$condition = array();
-			foreach($needProcess as $processKey => $value) $condition[] = $processKey . 'Finish == true';
-			$condition = join(' && ', $condition);
-			?>
-			if(<?php echo $condition?>) $.get('<?php echo inlink('afterExec', "fromVersion=$fromVersion&processed=yes")?>');
-            $('a#tohome').closest('.alert').show();
+            <?php
+            $condition = array();
+            foreach($needProcess as $processKey => $value) $condition[] = $processKey . 'Finish == true';
+            $condition = join(' && ', $condition);
+            ?>
+            if(<?php echo $condition?>)
+            {
+                $.get('<?php echo inlink('afterExec', "fromVersion=$fromVersion&processed=yes")?>');
+                $('a#tohome').closest('.alert').show();
+            }
         }
         else
         {