Merge branch 'master' into 'sprint/174_xieqiyu_45080'

# Conflicts: # module/story/control.php # module/story/view/header.html.php # module/testcase/control.php
2021-11-30 07:44:47 +00:00
parent 70d8039750 a4426db6f0
commit dbc186a0c4
375 changed files with 16559 additions and 3742 deletions
@@ -40,7 +40,7 @@ $config->bug->list->exportFields = 'id, product, branch, module, project, execut

 $config->bug->list->customCreateFields      = 'execution,story,task,pri,severity,os,browser,deadline,mailto,keywords';
 $config->bug->list->customBatchCreateFields = 'execution,steps,type,pri,deadline,severity,os,browser,keywords';
-$config->bug->list->customBatchEditFields   = 'type,severity,pri,productplan,assignedTo,deadline,status,resolvedBy,resolution,os,browser,keywords';
+$config->bug->list->customBatchEditFields   = 'type,severity,pri,productplan,assignedTo,deadline,resolvedBy,resolution,os,browser,keywords';

 $config->bug->custom = new stdclass();
 $config->bug->custom->createFields      = $config->bug->list->customCreateFields;
@@ -408,15 +408,7 @@ class bug extends control

            if($this->app->tab == 'execution')
            {
-	    	if(!preg_match("/(m=|\/)execution(&f=|-)bug(&|-|\.)?/", $this->session->bugList))
-	        {
-		    $location = $this->session->bugList;
-		}
-		else
-		{
-		    $executionID = $this->post->execution ? $this->post->execution : $output['executionID'];
-	            $location    = $this->createLink('execution', 'bug', "executionID=$executionID");
-		}
+                $location = $this->session->bugList ? $this->session->bugList : $this->createLink('execution', 'bug', "executionID={$output['executionID']}");
            }
            elseif($this->app->tab == 'project')
            {
@@ -678,6 +670,9 @@ class bug extends control
            }

            setcookie('bugModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
+
+            /* If link from no head then reload. */
+            if(isonlybody()) die(js::reload('parent.parent'));
            die(js::locate($this->createLink('bug', 'browse', "productID={$productID}&branch=$branch&browseType=unclosed&param=0&orderBy=id_desc"), 'parent'));
        }

@@ -882,6 +877,7 @@ class bug extends control
                    }
                }
            }
+            if(isonlybody()) die(js::reload('parent.parent'));
            die(js::locate($this->createLink('bug', 'view', "bugID=$bugID"), 'parent'));
        }

@@ -969,7 +965,7 @@ class bug extends control
        $this->view->productID        = $productID;
        $this->view->product          = $product;
        $this->view->productName      = $this->products[$productID];
-        $this->view->plans            = $this->loadModel('productplan')->getPairs($productID, $bug->branch);
+        $this->view->plans            = $this->loadModel('productplan')->getPairs($productID, $bug->branch, '', true);
        $this->view->projects         = array(0 => '') + $this->product->getProjectPairsByProduct($productID, $bug->branch, $bug->project);
        $this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, $bug->branch);
        $this->view->currentModuleID  = $currentModuleID;
@@ -995,6 +991,11 @@ class bug extends control
     */
    public function batchEdit($productID = 0, $branch = 0)
    {
+        if($this->app->tab == 'product')
+        {
+            $this->product->setMenu($productID);
+        }
+
        if($this->post->titles)
        {
            $allChanges = $this->bug->batchUpdate();
@@ -1035,7 +1036,7 @@ class bug extends control
            $branchProduct = $product->type == 'normal' ? false : true;

            /* Set plans. */
-            $plans = $this->loadModel('productplan')->getPairs($productID, $branch);
+            $plans = $this->loadModel('productplan')->getPairs($productID, $branch, '', true);
            $plans = array('' => '', 'ditto' => $this->lang->bug->ditto) + $plans;

            /* Set branches and modules. */
@@ -1257,6 +1258,33 @@ class bug extends control
        die(js::locate($this->session->bugList, 'parent'));
    }

+    /**
+     * Batch change the plan of bug.
+     *
+     * @param  int    $planID
+     * @access public
+     * @return void
+     */
+    public function batchChangePlan($planID)
+    {
+        if($this->post->bugIDList)
+        {
+            $bugIDList = $this->post->bugIDList;
+            $bugIDList = array_unique($bugIDList);
+            unset($_POST['bugIDList']);
+            $allChanges = $this->bug->batchChangePlan($bugIDList, $planID);
+            if(dao::isError()) die(js::error(dao::getError()));
+            foreach($allChanges as $bugID => $changes)
+            {
+                $this->loadModel('action');
+                $actionID = $this->action->create('bug', $bugID, 'Edited');
+                $this->action->logHistory($actionID, $changes);
+            }
+        }
+        $this->loadModel('score')->create('ajax', 'batchOther');
+        die(js::locate($this->session->bugList, 'parent'));
+    }
+
    /**
     * Batch update assign of bug.
     *
@@ -1,3 +1,5 @@
+#importLinesModal .modal-dialog {width: 80%;}
+
 .c-id {width: 50px !important;}
 .c-branch, .c-module, .c-os {width: 120px;}
 .c-execution {width: 130px;}
@@ -46,3 +46,4 @@ html[lang='en'] #deadlineTd .input-group-addon {padding: 5px 18px;}
 #osBox {width: 190px;}
 #projectBox .required:after {right: 1px;}
 #branch_chosen {min-width: 90px;}
+#notifyEmailTd .input-group-addon, #deadlineTd .input-group-addon {border-radius: 2px 0px 2px 0px !important;}
@@ -1,7 +1,16 @@
 .main-actions {display: none;}
-#main {margin-bottom: 40px;}
+#main {margin-bottom: 40px; min-width: unset;}
 #mainMenu .pull-left>a {display: none;}
 #mainMenu .pull-left .divider {display: none;}
 #mainMenu .pull-right {display: none;}
 #mainContent .col-4 {display: none;}
 .modal-dialog {width: 90%;}
+#mainMenu {position: fixed; width: 100%; z-index: 999;}
+#scrollContent {margin-top: 35px; height: calc(100% - 70px); display: block; overflow: hidden;}
+#scrollContent:hover{overflow: overlay;}
+html, body, #main, .container { height: 100%;}
+body * {font-size: 13px !important; line-height: 1.42857143; color: rgb(51, 51, 51);}
+.page-title > .label-id {min-width: 25px; line-height: 13px;}
+::-webkit-scrollbar {width: 10px; height: 10px;}
+::-webkit-scrollbar-thumb:vertical {box-shadow: inset 1px 1px 0 rgb(0 0 0 / 10%), inset 0 -1px 0 rgb(0 0 0 / 7%); background-color: rgba(0, 0, 0, 0.2); border-radius: 10px; opacity: 0; transition: opacity 0.1s;}
+.btn span{line-height: 16px; vertical-align: middle;}
@@ -662,4 +662,14 @@ function setBranchRelated(branchID, productID, num)
        }
        setOpenedBuilds(buildLink, num);
    }
+
+    if(config.currentMethod == 'batchedit')
+    {
+        planID   = $('#plans' + num).val();
+        planLink = createLink('product', 'ajaxGetPlans', 'productID=' + productID + '&branch=' + branchID + '&planID=' + planID + '&fieldID=' + num + '&needCreate=false&expired=&param=skipParent');
+        $('#plans' + num).parent('td').load(planLink, function()
+        {
+            $('#plans' + num).chosen();
+        });
+    }
 }
@@ -28,8 +28,14 @@ $(function()
        xuanAction += "<a href='" + url + "'" + title + target + btnClass + '>' + action + "</a>";
    });

-    xuanAction += '</div>';
-
-    $('body').append(xuanAction);
+    if(xuanAction != "<div class='xuancard-actions fixed'>")
+    {
+        xuanAction += '</div>';
+        $('body').append(xuanAction);
+    }
+    else
+    {
+        $('#scrollContent').css('height', 'calc(100% - 36px)');
+    }
    $('.xuancard-actions a.iframe').modalTrigger();
 })
@@ -41,13 +41,15 @@ $lang->bug->steps            = 'Repro Steps';
 $lang->bug->status           = 'Status';
 $lang->bug->statusAB         = 'Status';
 $lang->bug->subStatus        = 'Sub Status';
-$lang->bug->activatedCount   = 'Activated Times';
+$lang->bug->activatedCount   = 'Activation';
 $lang->bug->activatedCountAB = 'Active';
 $lang->bug->activatedDate    = 'ActivatedDate';
 $lang->bug->confirmed        = 'Confirmed';
 $lang->bug->confirmedAB      = 'C';
 $lang->bug->toTask           = 'Convert to Task';
 $lang->bug->toStory          = 'Convert to Story';
+$lang->bug->feedbackBy       = 'From Name';
+$lang->bug->notifyEmail      = 'From Email';
 $lang->bug->mailto           = 'Mailto';
 $lang->bug->openedBy         = 'ReportedBy';
 $lang->bug->openedByAB       = 'Reporter';
@@ -63,8 +65,8 @@ $lang->bug->resolvedByAB     = 'ResolvedBy';
 $lang->bug->resolution       = 'Resolution';
 $lang->bug->resolutionAB     = 'Resolution';
 $lang->bug->resolvedBuild    = 'Build';
-$lang->bug->resolvedDate     = 'Resolved Date';
-$lang->bug->resolvedDateAB   = 'ResolvedDate';
+$lang->bug->resolvedDate     = 'Resolved';
+$lang->bug->resolvedDateAB   = 'Resolved';
 $lang->bug->deadline         = 'Deadline';
 $lang->bug->deadlineAB       = 'Deadline';
 $lang->bug->plan             = 'Plan';
@@ -99,6 +101,7 @@ $lang->bug->edit               = 'Edit Bug';
 $lang->bug->batchEdit          = 'Batch Edit';
 $lang->bug->batchChangeModule  = 'Batch Edit Modules';
 $lang->bug->batchChangeBranch  = 'Batch Edit Branches';
+$lang->bug->batchChangePlan    = 'Batch Edit Plans';
 $lang->bug->batchClose         = 'Batch Close';
 $lang->bug->assignTo           = 'Assign';
 $lang->bug->assignAction       = 'Assign Bug';
@@ -48,6 +48,8 @@ $lang->bug->confirmed        = '是否确认';
 $lang->bug->confirmedAB      = '确认';
 $lang->bug->toTask           = '转任务';
 $lang->bug->toStory          = "转{$lang->SRCommon}";
+$lang->bug->feedbackBy       = '反馈者';
+$lang->bug->notifyEmail      = '通知邮箱';
 $lang->bug->mailto           = '抄送给';
 $lang->bug->openedBy         = '由谁创建';
 $lang->bug->openedByAB       = '创建者';
@@ -99,6 +101,7 @@ $lang->bug->edit               = '编辑Bug';
 $lang->bug->batchEdit          = '批量编辑';
 $lang->bug->batchChangeModule  = '批量修改模块';
 $lang->bug->batchChangeBranch  = '批量修改分支';
+$lang->bug->batchChangePlan    = '批量修改计划';
 $lang->bug->batchClose         = '批量关闭';
 $lang->bug->assignTo           = '指派';
 $lang->bug->assignAction       = '指派Bug';
@@ -278,8 +281,9 @@ $lang->bug->statusList['active']   = '激活';
 $lang->bug->statusList['resolved'] = '已解决';
 $lang->bug->statusList['closed']   = '已关闭';

-$lang->bug->confirmedList[1] = '是';
-$lang->bug->confirmedList[0] = '否';
+$lang->bug->confirmedList[''] = '';
+$lang->bug->confirmedList[1]  = '是';
+$lang->bug->confirmedList[0]  = '否';

 $lang->bug->resolutionList['']           = '';
 $lang->bug->resolutionList['bydesign']   = '设计如此';
@@ -85,7 +85,12 @@ class bugModel extends model
        /* Use classic mode to replace required project. */
        if($this->config->systemMode == 'classic' and strpos($this->config->bug->create->requiredFields, 'project') !== false) $this->config->bug->create->requiredFields = str_replace('project', 'execution', $this->config->bug->create->requiredFields);

-        $this->dao->insert(TABLE_BUG)->data($bug)->autoCheck()->batchCheck($this->config->bug->create->requiredFields, 'notempty')->exec();
+        $this->dao->insert(TABLE_BUG)->data($bug)
+            ->autoCheck()
+            ->checkIF($bug->notifyEmail, 'notifyEmail', 'email')
+            ->batchCheck($this->config->bug->create->requiredFields, 'notempty')
+            ->exec();
+
        if(!dao::isError())
        {
            $bugID = $this->dao->lastInsertID();
@@ -94,6 +99,8 @@ class bugModel extends model
            $this->file->saveUpload('bug', $bugID);
            empty($bug->case) ? $this->loadModel('score')->create('bug', 'create', $bugID) : $this->loadModel('score')->create('bug', 'createFormCase', $bug->case);

+            if($bug->execution) $this->loadModel('kanban')->updateLane($bug->execution, 'bug');
+
            /* Callback the callable method to process the related data for object that is transfered to bug. */
            if($from && is_callable(array($this, $this->config->bug->fromObjects[$from]['callback']))) call_user_func(array($this, $this->config->bug->fromObjects[$from]['callback']), $bugID);

@@ -249,6 +256,7 @@ class bugModel extends model
            $bugID = $this->dao->lastInsertID();

            $this->executeHooks($bugID);
+            if($bug->execution) $this->loadModel('kanban')->updateLane($bug->execution, 'bug');

            /* When the bug is created by uploading the image, add the image to the file of the bug. */
            $this->loadModel('score')->create('bug', 'create', $bugID);
@@ -661,6 +669,7 @@ class bugModel extends model
            ->batchCheck($this->config->bug->edit->requiredFields, 'notempty')
            ->checkIF($bug->resolvedBy, 'resolution',  'notempty')
            ->checkIF($bug->closedBy,   'resolution',  'notempty')
+            ->checkIF($bug->notifyEmail, 'notifyEmail', 'email')
            ->checkIF($bug->resolution == 'duplicate', 'duplicateBug', 'notempty')
            ->checkIF($bug->resolution == 'fixed',     'resolvedBuild','notempty')
            ->where('id')->eq((int)$bugID)
@@ -678,6 +687,8 @@ class bugModel extends model
            if(!empty($bug->resolvedBy)) $this->loadModel('score')->create('bug', 'resolve', $bugID);
            $this->file->updateObjectID($this->post->uid, $bugID, 'bug');

+            if($bug->execution and $bug->status != $oldBug->status) $this->loadModel('kanban')->updateLane($bug->execution, 'bug');
+
            return common::createChanges($oldBug, $bug);
        }
    }
@@ -917,6 +928,7 @@ class bugModel extends model
        if(!dao::isError())
        {
            $this->loadModel('score')->create('bug', 'confirmBug', $oldBug);
+            if($oldBug->execution) $this->loadModel('kanban')->updateLane($oldBug->execution, 'bug');
            return common::createChanges($oldBug, $bug);
        }
    }
@@ -1029,6 +1041,7 @@ class bugModel extends model
        if(!dao::isError())
        {
            $this->loadModel('score')->create('bug', 'resolve', $oldBug);
+            if($oldBug->execution) $this->loadModel('kanban')->updateLane($oldBug->execution, 'bug');

            /* Link bug to build and release. */
            $this->linkBugToBuild($bugID, $bug->resolvedBuild);
@@ -1096,6 +1109,35 @@ class bugModel extends model
        return $allChanges;
    }

+    /**
+     * Batch change the plan of bug.
+     *
+     * @param  array  $bugIDList
+     * @param  int    $planID
+     * @access public
+     * @return array
+     */
+    public function batchChangePlan($bugIDList, $planID)
+    {
+        $now        = helper::now();
+        $allChanges = array();
+        $oldBugs    = $this->getByList($bugIDList);
+        foreach($bugIDList as $bugID)
+        {
+            $oldBug = $oldBugs[$bugID];
+            if($planID == $oldBug->plan) continue;
+
+            $bug = new stdclass();
+            $bug->lastEditedBy   = $this->app->user->account;
+            $bug->lastEditedDate = $now;
+            $bug->plan           = $planID;
+
+            $this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->where('id')->eq((int)$bugID)->exec();
+            if(!dao::isError()) $allChanges[$bugID] = common::createChanges($oldBug, $bug);
+        }
+        return $allChanges;
+    }
+
    /**
     * Batch resolve bugs.
     *
@@ -1161,6 +1203,7 @@ class bugModel extends model
            $this->dao->update(TABLE_BUG)->data($bug)->where('id')->eq($bugID)->exec();
            $this->executeHooks($bugID);

+            if($oldBug->execution) $this->loadModel('kanban')->updateLane($oldBug->execution, 'bug');
            $changes[$bugID] = common::createChanges($oldBug, $bug);
        }

@@ -1179,7 +1222,12 @@ class bugModel extends model
     */
    public function activate($bugID)
    {
-        $oldBug = $this->getById($bugID);
+        $bugID      = (int)$bugID;
+        $oldBug     = $this->getById($bugID);
+        $solveBuild = $this->dao->select('id')
+            ->from(TABLE_BUILD)
+            ->where("CONCAT(',', bugs, ',')")->like("%,{$bugID},%")
+            ->fetch('id');
        $now = helper::now();
        $bug = fixer::input('post')
            ->setDefault('assignedTo',     $oldBug->resolvedBy)
@@ -1205,19 +1253,15 @@ class bugModel extends model
        $this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->where('id')->eq((int)$bugID)->exec();
        $this->dao->update(TABLE_BUG)->set('activatedCount = activatedCount + 1')->where('id')->eq((int)$bugID)->exec();

-        $openedBuilds = explode(',', $oldBug->openedBuild);
-        if($openedBuilds)
+        if($solveBuild)
        {
            $this->loadModel('build');
-            foreach($openedBuilds as $openedBuild)
-            {
-                $build = $this->build->getByID($openedBuild);
-                if(empty($build)) continue;
-                $build->bugs = trim(str_replace(",$bugID,", ',', ",$build->bugs,"), ',');
-                $this->dao->update(TABLE_BUILD)->set('bugs')->eq($build->bugs)->where('id')->eq((int)$openedBuild)->exec();
-            }
+            $build = $this->build->getByID($solveBuild);
+            $build->bugs = trim(str_replace(",$bugID,", ',', ",$build->bugs,"), ',');
+            $this->dao->update(TABLE_BUILD)->set('bugs')->eq($build->bugs)->where('id')->eq((int)$solveBuild)->exec();
        }

+        if($oldBug->execution) $this->loadModel('kanban')->updateLane($oldBug->execution, 'bug');
        $bug->activatedCount += 1;
        return common::createChanges($oldBug, $bug);
    }
@@ -1246,6 +1290,7 @@ class bugModel extends model
            ->get();

        $this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->where('id')->eq((int)$bugID)->exec();
+        if($oldBug->execution) $this->loadModel('kanban')->updateLane($oldBug->execution, 'bug');

        return common::createChanges($oldBug, $bug);
    }
@@ -1583,7 +1628,9 @@ class bugModel extends model
                ->beginIF($type == 'noclosed')->andWhere('status')->ne('closed')->fi()
                ->beginIF($build)->andWhere("CONCAT(',', openedBuild, ',') like '%,$build,%'")->fi()
                ->beginIF($excludeBugs)->andWhere('id')->notIN($excludeBugs)->fi()
-                ->orderBy($orderBy)->page($pager)->fetchAll();
+                ->orderBy($orderBy)
+                ->page($pager)
+                ->fetchAll('id');
        }

        $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug');
@@ -1602,7 +1649,7 @@ class bugModel extends model
     * @access public
     * @return array
     */
-    public function getProductLeftBugs($build, $productID, $branch = 0, $linkedBugs = '', $pager = null)
+    public function getProductLeftBugs($build, $productID, $branch = '', $linkedBugs = '', $pager = null)
    {
        $build = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->eq($build)->fetch();
        if(empty($build->execution)) return array();
@@ -1625,7 +1672,7 @@ class bugModel extends model
            ->andWhere("(status = 'active' OR resolvedDate > '{$execution->end}')")
            ->andWhere('openedBuild')->notin($beforeBuilds)
            ->beginIF($linkedBugs)->andWhere('id')->notIN($linkedBugs)->fi()
-            ->beginIF($branch)->andWhere('branch')->in("0,$branch")->fi()
+            ->beginIF($branch !== '')->andWhere('branch')->in("0,$branch")->fi()
            ->page($pager)
            ->fetchAll();

@@ -59,7 +59,6 @@
            <th class='c-plan<?php echo zget($visibleFields, 'productplan', ' hidden') . zget($requiredFields, 'productplan', '', ' required');?>'><?php echo $lang->bug->productplan;?></th>
            <th class='c-assigned<?php echo zget($visibleFields, 'assignedTo', ' hidden') . zget($requiredFields, 'assignedTo', '', ' required');?>'><?php echo $lang->bug->assignedTo;?></th>
            <th class='c-date<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline', '', ' required');?>'><?php echo $lang->bug->deadline;?></th>
-            <th class='c-status<?php echo zget($visibleFields, 'status', ' hidden')?>'><?php echo $lang->bug->status;?></th>
            <th class='c-os<?php echo zget($visibleFields, 'os', ' hidden') . zget($requiredFields, 'os', '', ' required');?>'><?php echo $lang->bug->os;?></th>
            <th class='c-browser<?php echo zget($visibleFields, 'browser', ' hidden') . zget($requiredFields, 'browser', '', ' required');?>'><?php echo $lang->bug->browser;?></th>
            <th class='c-keywords<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->bug->keywords;?></th>
@@ -119,7 +118,6 @@
            <td class='<?php echo zget($visibleFields, 'productplan', ' hidden')?>' style='overflow:visible'><?php echo html::select("plans[$bugID]", $plans, $bug->plan, "class='form-control chosen'");?></td>
            <td class='<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>' style='overflow:visible'><?php echo html::select("assignedTos[$bugID]", $users, $bug->assignedTo, "class='form-control chosen'");?></td>
            <td class='<?php echo zget($visibleFields, 'deadline', ' hidden')?>' style='overflow:visible'><?php echo html::input("deadlines[$bugID]", $bug->deadline, "class='form-control form-date'");?></td>
-            <td <?php echo zget($visibleFields, 'status', "class='hidden'")?>><?php echo html::select("statuses[$bugID]", $statusList, $bug->status, 'class=form-control');?></td>
            <td <?php echo zget($visibleFields, 'os', "class='hidden'")?>><?php echo html::select("os[$bugID]", $osList, $bug->os, 'class=form-control');?></td>
            <td <?php echo zget($visibleFields, 'browser', "class='hidden'")?>><?php echo html::select("browsers[$bugID]", $browserList, $bug->browser, 'class=form-control');?></td>
            <td <?php echo zget($visibleFields, 'keywords', "class='hidden'")?>><?php echo html::input("keywords[$bugID]", $bug->keywords, 'class=form-control');?></td>
@@ -143,7 +141,7 @@
          <tr>
            <td colspan='<?php echo $branchProduct ? $columns : ($columns - 1);?>' class='text-center form-actions'>
              <?php echo html::submitButton();?>
-              <?php echo html::backButton();?>
+              <?php echo $this->app->tab == 'product' ? html::a($this->session->bugList, $lang->goback, '', "class='btn btn-back btn-wide'") : html::backButton();?>
            </td>
          </tr>
        </tfoot>
@@ -146,6 +146,26 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
              </div>
            </td>
          </tr>
+          <tr>
+            <th><nobr><?php echo $lang->bug->feedbackBy;?></nobr></th>
+            <td><?php echo html::input('feedbackBy', '', "class='form-control'");?></td>
+            <td id='notifyEmailTd'>
+              <div class='input-group'>
+                <span class='input-group-addon'><?php echo $lang->bug->notifyEmail?></span>
+                <span><?php echo html::input('notifyEmail', '', "class='form-control'");?></span>
+              </div>
+            </td>
+          </tr>
+          <?php else:?>
+            <td>
+              <div class='input-group' id='feedback'>
+              <span class="input-group-addon"><?php echo $lang->bug->feedbackBy?></span>
+              <?php echo html::input('feedbackBy', '', "class='form-control'");?>
+              <span class="input-group-addon"><?php echo $lang->bug->notifyEmail?></span>
+              <?php echo html::input('notifyEmail', '', "class='form-control'");?>
+              </div>
+            </td>
+          </tr>
          <?php endif;?>
          <?php if($showExecution):?>
          <?php $showOS      = strpos(",$showFields,", ',os,')      !== false;?>
@@ -137,7 +137,7 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                </tr>
                <tr>
                  <th><?php echo $lang->bug->status;?></th>
-                  <td><?php echo html::select('status', $lang->bug->statusList, $bug->status, "class='form-control chosen'");?></td>
+                  <td><?php echo zget($lang->bug->statusList, $bug->status);?></td>
                </tr>
                <tr>
                  <th><?php echo $lang->bug->confirmed;?></th>
@@ -151,6 +151,14 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                  <th><?php echo $lang->bug->deadline;?></th>
                  <td><?php echo html::input('deadline', $bug->deadline, "class='form-control form-date'");?></td>
                </tr>
+                <tr>
+                  <th><?php echo $lang->bug->feedbackBy;?></th>
+                  <td><?php echo html::input('feedbackBy', $bug->feedbackBy, "class='form-control'");?></td>
+                </tr>
+                <tr>
+                  <th><?php echo $lang->bug->notifyEmail;?></th>
+                  <td><?php echo html::input('notifyEmail', $bug->notifyEmail, "class='form-control'");?></td>
+                </tr>
                <tr>
                  <th><?php echo $lang->bug->os;?></th>
                  <td><?php echo html::select('os', $lang->bug->osList, $bug->os, "class='form-control chosen'");?></td>
@@ -37,6 +37,9 @@
  </div>
  <?php endif;?>
 </div>
+<?php if($this->app->getViewType() == 'xhtml'):?>
+<div id="scrollContent">
+<?php endif;?>
 <div id="mainContent" class="main-row">
  <div class="main-col col-8">
    <div class="cell">
@@ -65,7 +68,9 @@
      ?>
    </div>
    <?php $this->printExtendFields($bug, 'div', "position=left&inForm=0&inCell=1");?>
-    <div class='cell'><?php include '../../common/view/action.html.php';?></div>
+    <?php if($this->app->getViewType() != 'xhtml'):?>
+    <div class="cell"><?php include '../../common/view/action.html.php';?></div>
+    <?php endif;?>
    <?php
    $params        = "bugID=$bug->id";
    $extraParams   = "extras=bugID=$bug->id";
@@ -88,7 +93,7 @@

        if($this->app->tab != 'product')
        {
-            common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id", $bug, 'button', $lang->icons['story'], '', '', '', "data-app='product'", $lang->bug->toStory);
+            common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id", $bug, 'button', $lang->icons['story'], '', '', '', "data-app='" . $this->app->tab . "'", $lang->bug->toStory);
            common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap');
        }

@@ -223,6 +228,14 @@
                    ?>
                  </td>
                </tr>
+                <tr>
+                  <th><?php echo $lang->bug->feedbackBy;?></th>
+                  <td><?php echo $bug->feedbackBy;?></td>
+                </tr>
+                <tr>
+                  <th><?php echo $lang->bug->notifyEmail;?></th>
+                  <td><?php echo $bug->notifyEmail;?></td>
+                </tr>
                <tr>
                  <th><?php echo $lang->bug->os;?></th>
                  <td><?php echo $lang->bug->osList[$bug->os];?></td>
@@ -300,7 +313,11 @@
                    if($bug->openedBuild)
                    {
                        $openedBuilds = explode(',', $bug->openedBuild);
-                        foreach($openedBuilds as $openedBuild) isset($builds[$openedBuild]) ? print($builds[$openedBuild] . '<br />') : print($openedBuild . '<br />');
+                        foreach($openedBuilds as $openedBuild)
+                        {
+                            if(!$openedBuild) continue;
+                            isset($builds[$openedBuild]) ? print($builds[$openedBuild] . '<br />') : print($openedBuild . '<br />');
+                        }
                    }
                    else
                    {
@@ -394,6 +411,9 @@
    <?php $this->printExtendFields($bug, 'div', "position=right&inForm=0&inCell=1");?>
  </div>
 </div>
+<?php if($this->app->getViewType() == 'xhtml'):?>
+</div>
+<?php endif;?>

 <div id="mainActions" class='main-actions'>
  <?php common::printPreAndNext($preAndNext);?>