diff --git a/module/product/model.php b/module/product/model.php
index d83ac6e391..a32bb2c57f 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -592,6 +592,7 @@ class productModel extends model
->beginIF($branch)->andWhere('t1.branch')->in($branch)->fi()
->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
->andWhere('t2.deleted')->eq(0)
+ ->orderBy('t1.project desc')
->fetchAll();
foreach($datas as $data)
diff --git a/module/task/model.php b/module/task/model.php
index 2c75c83e68..7a015125b4 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2390,7 +2390,6 @@ class taskModel extends model
switch($id)
{
case 'id':
- //if($mode == 'table' && $canBatchAction)
if($canBatchAction)
{
echo html::checkbox('taskIDList', array($task->id => sprintf('%03d', $task->id)));
diff --git a/module/testcase/model.php b/module/testcase/model.php
index fa706c6cc5..302a4b953e 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1422,7 +1422,6 @@ class testcaseModel extends model
$class = 'result-' . $case->lastRunResult;
$lastRunResultText = $case->lastRunResult ? zget($this->lang->testcase->resultList, $case->lastRunResult, $case->lastRunResult) : $this->lang->testcase->unexecuted;
echo "" . $lastRunResultText . "";
- //html::a(helper::createLink('testtask', 'results', "runID=0&caseID=$case->id", '', true), " {$lastRunResultText}", '', "class='iframe btn btn-icon-left btn-sm'");
break;
case 'bugs':
echo (common::hasPriv('testcase', 'bugs') and $case->bugs) ? html::a(helper::createLink('testcase', 'bugs', "runID=0&caseID={$case->id}"), $case->bugs, '', "class='iframe'") : $case->bugs;
diff --git a/module/user/control.php b/module/user/control.php
index 9288916d6c..9b0373f090 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -781,8 +781,7 @@ class user extends control
}
$errorScript = js::error($this->lang->user->loginFailed);
- /* Finish task #4851. */
- if($this->post->verifyRand and !isset($_SESSION['rand'])) $errorScript .= js::reload('parent');
+ if($this->post->verifyRand and !isset($_SESSION['rand'])) $errorScript .= js::reload('parent'); // Finish task #4851.
die($errorScript);
}
}
diff --git a/module/user/css/login.css b/module/user/css/login.css
index c8983a3e6a..23e9a6acd0 100644
--- a/module/user/css/login.css
+++ b/module/user/css/login.css
@@ -1,5 +1,4 @@
-body {background: #1183fb linear-gradient(-90deg, #0a48d1 0%, #1183fb 100%);
- background-color: #1183fb;}
+body {background: #1183fb linear-gradient(-90deg, #0a48d1 0%, #1183fb 100%); background-color: #1183fb;}
#login {max-width: 600px!important; margin: 0 auto; margin-top: 5%;}
#loginPanel {background: #fff; overflow: hidden; box-shadow: 0 0 20px 0 rgba(0,0,0,.1); border-radius: 3px;}
#loginPanel > header {padding: 20px; border-bottom: 1px #eee solid; position: relative;}
@@ -14,4 +13,4 @@ html[lang='en'] #loginPanel .table-form > tbody > tr > th {width: 80px;}
#info {margin-top: 10px; color: #fff;}
#info .btn + .btn {margin-left: 5px;}
#langs > .btn,
-#langs > .dropdown-menu {min-width: 0; width: 85px;}
\ No newline at end of file
+#langs > .dropdown-menu {min-width: 0; width: 85px;}