| productplan->begin;?> |
- begin != '2030-01-01' ? formatTime($plan->begin) : '', "class='form-control form-date'");?> |
+
+
+ begin != '2030-01-01' ? formatTime($plan->begin) : '', "class='form-control form-date'");?>
+ begin == '2030-01-01' || $plan->end == '2030-01-01' ? "checked='checked'" : '';?>
+
+
+
+
+ |
| productplan->end;?> |
diff --git a/module/project/model.php b/module/project/model.php
index 2ef1fb26b7..50742242dc 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1081,6 +1081,7 @@ class projectModel extends model
$productType = $product->type;
if($product->branch)
{
+ if(!isset($branchGroups[$product->id][$product->branch])) continue;
$branchPairs[$product->branch] = (count($products) > 1 ? $product->name . '/' : '') . $branchGroups[$product->id][$product->branch];
}
else
diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index 81f6499ae9..6cf6e45adf 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -44,7 +44,7 @@ include '../../common/view/chosen.html.php';
#searchlite {line-height: 127px}
#searchform.showmore #searchmore, #searchform #searchlite {display: none;}
#searchform.showmore #searchlite, #searchform #searchmore {display: inline-block;}
-#searchform .chosen-container[id^="field"] .chosen-drop{min-width: 120px;}
+#searchform .chosen-container[id^="field"] .chosen-drop{min-width: 140px;}
#searchform [id^="valueBox"] .chosen-container .chosen-single{max-width: 170px;}
#searchform [id^="valueBox"] .chosen-container .chosen-drop{min-width: 400px;}
#searchform .chosen-container .chosen-drop ul.chosen-results li{white-space:normal}
diff --git a/module/story/model.php b/module/story/model.php
index 624250069c..a6ea673cfe 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1615,8 +1615,8 @@ class storyModel extends model
->where($sql)
->beginIF($productID != 'all' and $productID != '')->andWhere('t1.`product`')->eq((int)$productID)->fi()
->andWhere('deleted')->eq(0)
- ->orderBy($orderBy, 't1.id')
- ->page($pager)
+ ->orderBy($orderBy)
+ ->page($pager, 't1.id')
->fetchAll('id');
if(!$tmpStories) return array();
@@ -1962,7 +1962,7 @@ class storyModel extends model
{
if($type == 'short')
{
- $property = '[p' . $story->pri . ', ' . $story->estimate . 'h]';
+ $property = '[p' . (!empty($this->lang->story->priList[$story->pri]) ? $this->lang->story->priList[$story->pri] : 0) . ', ' . $story->estimate . 'h]';
}
else
{
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 01921eb89b..0f1e3eec71 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -113,7 +113,7 @@
$hasCustomPri = false;
foreach($lang->story->priList as $priKey => $priValue)
{
- if(!empty($priKey) and ($priKey != $priValue or strlen($priKey) != strlen($priValue)))
+ if(!empty($priKey) and (string)$priKey != (string)$priValue)
{
$hasCustomPri = true;
break;
diff --git a/module/task/css/create.css b/module/task/css/create.css
index 21e7dcdaab..d14b89ef57 100644
--- a/module/task/css/create.css
+++ b/module/task/css/create.css
@@ -14,4 +14,6 @@
#taskPlanCol, #mailCol {width: 50%}
#planAndMailCell.has-mail-col #taskPlanCol {padding-right: 5px;}
#planAndMailCell.has-mail-col #taskPlanCol + #mailCol {padding-left: 5px;}
-.input-group-addon input[type='checkBox']{}
\ No newline at end of file
+.input-group-addon input[type='checkBox']{}
+
+#modalTeam .modal-content{padding:8px 25px;}
diff --git a/module/task/css/edit.css b/module/task/css/edit.css
index 865ead609b..783273dc00 100644
--- a/module/task/css/edit.css
+++ b/module/task/css/edit.css
@@ -3,3 +3,6 @@
#finishedDate.form-control.form-date {width: 218px!important}
#canceledDate.form-control.form-date {width: 218px!important}
#closedDate.form-control.form-date {width: 218px!important}
+
+#modalTeam .modal-content{padding:8px 25px;}
+#modalTeam .modal-content .table{border:none;}
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 5863db6299..0ac596761c 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -43,7 +43,7 @@
assignedTo, "class='form-control chosen'");?>
task->team;?>
-
+
@@ -90,7 +90,7 @@
$hasCustomPri = false;
foreach($lang->task->priList as $priKey => $priValue)
{
- if(!empty($priKey) and ($priKey != $priValue or strlen($priKey) != strlen($priValue)))
+ if(!empty($priKey) and (string)$priKey != (string)$priValue)
{
$hasCustomPri = true;
break;
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 3c30db426b..e972abb32a 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -101,7 +101,7 @@
$hasCustomPri = false;
foreach($lang->testcase->priList as $priKey => $priValue)
{
- if(!empty($priKey) and ($priKey != $priValue or strlen($priKey) != strlen($priValue)))
+ if(!empty($priKey) and (string)$priKey != (string)$priValue)
{
$hasCustomPri = true;
break;
diff --git a/module/testsuite/view/createcase.html.php b/module/testsuite/view/createcase.html.php
index 4f5d40a6f5..3291cbaa3a 100644
--- a/module/testsuite/view/createcase.html.php
+++ b/module/testsuite/view/createcase.html.php
@@ -78,7 +78,7 @@
$hasCustomPri = false;
foreach($lang->testcase->priList as $priKey => $priValue)
{
- if(!empty($priKey) and ($priKey != $priValue or strlen($priKey) != strlen($priValue)))
+ if(!empty($priKey) and (string)$priKey != (string)$priValue)
{
$hasCustomPri = true;
break;
diff --git a/module/webhook/config.php b/module/webhook/config.php
index df7384e81f..3a014363fd 100644
--- a/module/webhook/config.php
+++ b/module/webhook/config.php
@@ -16,3 +16,5 @@ $config->webhook->objectTypes['bug'] = array('opened', 'edited', 'commen
$config->webhook->objectTypes['case'] = array('opened', 'edited', 'commented', 'reviewed', 'confirmed');
$config->webhook->objectTypes['testtask'] = array('opened', 'edited', 'started', 'blocked', 'closed', 'activated');
$config->webhook->objectTypes['todo'] = array('opened', 'edited');
+
+$config->webhook->needAssignTypes = array('story', 'task', 'bug', 'todo');
diff --git a/module/webhook/model.php b/module/webhook/model.php
index c053433e9d..58075f3447 100644
--- a/module/webhook/model.php
+++ b/module/webhook/model.php
@@ -227,13 +227,16 @@ class webhookModel extends model
$mobile = '';
$email = '';
- foreach($users as $user)
+ if(in_array($objectType, $this->config->webhook->needAssignTypes) && !empty($object->assignedTo))
{
- if($user->account == $object->assignedTo)
+ foreach($users as $user)
{
- $mobile = $user->mobile;
- $email = $user->email;
- break;
+ if($user->account == $object->assignedTo)
+ {
+ $mobile = $user->mobile;
+ $email = $user->email;
+ break;
+ }
}
}
$action->text = $text;
|