From f3b764c07921ba24201f8827d516b5089088161a Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 19 May 2016 11:41:52 +0800
Subject: [PATCH]  * adjust for check custom pri and severity when create.

---
 module/bug/view/create.html.php      | 28 ++++++++++++++++++++++++----
 module/story/view/create.html.php    | 14 ++++++++++++--
 module/task/view/create.html.php     | 24 +++++++++++++++++-------
 module/testcase/view/create.html.php | 14 ++++++++++++--
 4 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index e1f0135a39..27f771289e 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -126,8 +126,18 @@ js::set('refresh', $lang->refresh);
               <div class='input-group'>
                 <?php if($showSeverity):?>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->bug->severity;?></span>
-                <?php $isAllNumberSeverity = is_numeric(join($lang->bug->severityList));?>
-                <?php if(!$isAllNumberSeverity):?>
+                <?php
+                $hasCustomSeverity = false;
+                foreach($lang->bug->severityList as $severityKey => $severityValue)
+                {
+                    if($severityKey != $severityValue)
+                    {
+                        $hasCustomSeverity = true;
+                        break;
+                    }
+                }
+                ?>
+                <?php if($hasCustomSeverity):?>
                 <?php echo html::select('severity', (array)$lang->bug->severityList, $severity, "class='form-control minw-80px'");?> 
                 <?php else: ?>
                 <div class='input-group-btn dropdown-pris' data-prefix='severity'>
@@ -141,8 +151,18 @@ js::set('refresh', $lang->refresh);
                 <?php endif;?>
                 <?php if($showPri):?>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->bug->pri;?></span>
-                <?php $isAllNumberPri = is_numeric(join($lang->bug->priList));?>
-                <?php if(!$isAllNumberPri):?>
+                <?php
+                $hasCustomPri = false;
+                foreach($lang->bug->priList as $priKey => $priValue)
+                {
+                    if($priKey != $priValue)
+                    {
+                        $hasCustomPri = true;
+                        break;
+                    }
+                }
+                ?>
+                <?php if($hasCustomPri):?>
                 <?php echo html::select('pri', (array)$lang->bug->priList, '', "class='form-control minw-80px'");?> 
                 <?php else: ?>
                 <div class='input-group-btn dropdown-pris'>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 4b27ee1c4f..51c140f795 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -105,8 +105,18 @@
               <div class="input-group">
                 <?php if(!$hiddenPri):?>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->story->pri;?></span>
-                <?php $isAllNumberPri = is_numeric(join('', $lang->story->priList)); ?>
-                <?php if(!$isAllNumberPri):?>
+                <?php
+                $hasCustomPri = false;
+                foreach($lang->story->priList as $priKey => $priValue)
+                {
+                    if($priKey != $priValue)
+                    {
+                        $hasCustomPri = true;
+                        break;
+                    }
+                }
+                ?>
+                <?php if($hasCustomPri):?>
                 <?php echo html::select('pri', (array)$lang->story->priList, $pri, "class='form-control minw-80px'");?> 
                 <?php else: ?>
                 <div class='input-group-btn dropdown-pris' data-set='0,1,2,3,4'>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 58ce1e728c..f74b8d1870 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -74,8 +74,18 @@
               <div class="input-group">
                 <?php if(!$hiddenPri):?>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->task->pri;?></span>
-                <?php $isAllNumberPri = is_numeric(join($lang->task->priList));?>
-                <?php if(!$isAllNumberPri):?>
+                <?php
+                $hasCustomPri = false;
+                foreach($lang->task->priList as $priKey => $priValue)
+                {
+                    if($priKey != $priValue)
+                    {
+                        $hasCustomPri = true;
+                        break;
+                    }
+                }
+                ?>
+                <?php if($hasCustomPri):?>
                 <?php echo html::select('pri', $lang->task->priList, '', "class='form-control minw-80px'");?> 
                 <?php else: ?>
                 <div class='input-group-btn dropdown-pris'>
@@ -101,11 +111,11 @@
         <th><?php echo $lang->task->desc;?></th>
         <td colspan='3'><?php echo html::textarea('desc', $task->desc, "rows='10' class='form-control'");?></td>
       </tr>  
-      <?php
-      $hiddenEstStarted = strpos(",$showFields,", ',estStarted,') === false;
-      $hiddenDeadline   = strpos(",$showFields,", ',deadline,') === false;
-      $hiddenMailto     = strpos(",$showFields,", ',mailto,') === false;
-      ?>
+<?php
+            $hiddenEstStarted = strpos(",$showFields,", ',estStarted,') === false;
+            $hiddenDeadline   = strpos(",$showFields,", ',deadline,') === false;
+            $hiddenMailto     = strpos(",$showFields,", ',mailto,') === false;
+?>
       <?php if(!$hiddenEstStarted or !$hiddenDeadline or !$hiddenMailto):?>
       <tr>
         <th><?php echo ($hiddenEstStarted and $hiddenDeadline) ? $lang->task->mailto : $lang->task->datePlan;?></th>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index 6bd1018044..238f91c295 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -94,8 +94,18 @@
             <div class='col-table'>
               <div class='input-group'>
                 <span class='input-group-addon fix-border br-0'><?php echo $lang->testcase->pri;?></span>
-                <?php $isAllNumberPri = is_numeric(join($lang->testcase->priList));?>
-                <?php if(!$isAllNumberPri):?>
+                <?php
+                $hasCustomPri = false;
+                foreach($lang->testcase->priList as $priKey => $priValue)
+                {
+                    if($priKey != $priValue)
+                    {
+                        $hasCustomPri = true;
+                        break;
+                    }
+                }
+                ?>
+                <?php if($hasCustomPri):?>
                 <?php echo html::select('pri', (array)$lang->testcase->priList, $pri, "class='form-control minw-80px'");?> 
                 <?php else: ?>
                 <div class='input-group-btn dropdown-pris'>