diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 64cef9810f..9f1b3085b9 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -123,8 +123,8 @@ js::set('moduleID', $moduleID); id));?> - severity;?>'>severity;?> - bug->priList[$bug->pri];?>'>bug->priList[$bug->pri];?> + bug->severityList, $bug->severity, $bug->severity);?>'>bug->severityList, $bug->severity, $bug->severity);?> + bug->priList, $bug->pri, $bug->pri);?>'>bug->priList, $bug->pri, $bug->pri);?> confirmed;?> [{$lang->bug->confirmedList[$bug->confirmed]}] " . html::a($bugLink, $bug->title);?> diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index 20ad5ccbf6..0759e8912c 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -64,7 +64,7 @@ createLink('story', 'view', "storyID=$story->id", '', true);?> id);?> - story->priList[$story->pri]?>'>story->priList[$story->pri];?> + story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> title, '', "class='preview'");?> openedBy];?> estimate;?> diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index c09768d83d..4cb3d38cf0 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -46,8 +46,8 @@ createLink('bug', 'view', "bugID=$bug->id"), sprintf('%03d', $bug->id), '_blank');?> - bug->severityList[$bug->severity]?>'>bug->severityList[$bug->severity]) ? $lang->bug->severityList[$bug->severity] : $bug->severity;?> - bug->priList[$bug->pri]?>'>bug->priList[$bug->pri]) ? $lang->bug->priList[$bug->pri] : $bug->pri?> + bug->severityList, $bug->severity, $bug->severity)?>'>bug->severityList, $bug->severity, $bug->severity);?> + bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri)?> bug->typeList[$bug->type]?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> openedBy];?> diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index 05ab2dcb92..71f9ea1964 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -52,7 +52,7 @@ id));?> - pri;?>'>pri?> + story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> productTitle;?> title);?> planTitle;?> diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index bff9d1cb80..7ce78d4b78 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -50,7 +50,7 @@ createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?> - task->priList[$task->pri];?>'>task->priList[$task->pri]) ? $lang->task->priList[$task->pri] : $task->pri;?> + task->priList, $task->pri, $task->pri);?>'>task->priList, $task->pri, $task->pri);?> createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?> createLink('task', 'view', "taskID=$task->id"), $task->name);?> estimate;?> diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index 7873fa56f4..e18f095dcf 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -54,7 +54,7 @@ createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?> - pri?>'>pri?> + testcase->priList, $case->pri, $case->pri)?>'>testcase->priList, $case->pri, $case->pri)?> createLink('testcase', 'view', "testcaseID=$case->id"), $case->title);?> testcase->typeList[$case->type];?> openedBy];?> diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index 7324befd6f..bee570bdcf 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -71,7 +71,7 @@ date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?> todo->typeList[$todo->type];?> - pri;?>'>pri?> + todo->priList, $todo->pri, $todo->pri);?>'>todo->priList, $todo->pri, $todo->pri)?> createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "data-toggle='modal' data-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?> begin;?> end;?> diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index c4c1ed7e8e..6d47ba5b7d 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -98,7 +98,7 @@ id)); else printf('%03d', $story->id);?> - story->priList[$story->pri];?>'>story->priList[$story->pri]?> + story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri)?> title);?> planTitle;?> story->sourceList[$story->source];?> diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php index 0fb800e7b2..046ce37501 100644 --- a/module/productplan/view/linkbug.html.php +++ b/module/productplan/view/linkbug.html.php @@ -47,7 +47,7 @@ createLink('bug', 'view', "bugID=$bug->id"), $bug->id);?> - pri;?>'>pri?> + bug->priList, $bug->pri, $bug->pri);?>'>bug->priList, $bug->pri, $bug->pri)?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> openedBy];?> assignedTo];?> @@ -89,7 +89,7 @@ createLink('bug', 'view', "bugID=$bug->id"), sprintf("%03d", $bug->id));?> - pri;?>'>pri?> + bug->priList, $bug->pri, $bug->pri);?>'>bug->priList, $bug->pri, $bug->pri);?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> openedBy];?> assignedTo];?> diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index 8cd6a46a61..603c61fe43 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -46,7 +46,7 @@ createLink('story', 'view', "storyID=$story->id"), $story->id);?> - pri;?>'>pri?> + story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri)?> planTitle;?> createLink('story', 'view', "storyID=$story->id"), $story->title);?> openedBy];?> @@ -93,7 +93,7 @@ createLink('story', 'view', "storyID=$story->id"), sprintf("%03d", $story->id));?> - pri;?>'>pri?> + story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> createLink('story', 'view', "storyID=$story->id"), $story->title);?> openedBy];?> assignedTo];?> diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 377045cf6d..fc86c209f2 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -92,7 +92,7 @@ id));?> - pri?>'>pri;?> + story->priList, $story->pri, $story->pri)?>'>story->priList, $story->pri, $story->pri);?> title);?> openedBy];?> assignedTo];?> @@ -154,7 +154,7 @@ createLink('bug', 'view', "bugID=$bug->id"), sprintf("%03d", $bug->id));?> - pri?>'>pri;?> + bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri);?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> openedBy];?> assignedTo];?> diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php index 2791b091ba..d111f7cba0 100644 --- a/module/project/view/bug.html.php +++ b/module/project/view/bug.html.php @@ -39,8 +39,8 @@ createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?> - bug->severityList[$bug->severity]?>'>bug->severityList[$bug->severity]?> - bug->priList[$bug->pri]?>'>bug->priList[$bug->pri]?> + bug->severityList, $bug->severity, $bug->severity)?>'>bug->severityList, $bug->severity, $bug->severity)?> + bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri)?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> openedBy, $bug->openedBy);?> assignedTo, $bug->assignedTo);?> diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php index ffc35364fb..3728770241 100644 --- a/module/project/view/grouptask.html.php +++ b/module/project/view/grouptask.html.php @@ -94,7 +94,7 @@  id . $lang->colon; if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?> - pri?>'>pri;?> + task->priList, $task->pri, $task->pri)?>'>task->priList, $task->pri, $task->pri);?> >assignedToRealName;?> finishedBy];?> estimate;?> diff --git a/module/project/view/importbug.html.php b/module/project/view/importbug.html.php index 4ede39a9a1..ee62b8a2d8 100755 --- a/module/project/view/importbug.html.php +++ b/module/project/view/importbug.html.php @@ -47,8 +47,8 @@ var browseType = ''; id]", '');?> id) . html::hidden("id[$bug->id]", $bug->id);?> - bug->severityList[$bug->severity]?>'>bug->severityList[$bug->severity]?> - bug->priList[$bug->pri]?>'>bug->priList[$bug->pri]?> + bug->severityList, $bug->severity, $bug->severity)?>'>bug->severityList, $bug->severity, $bug->severity)?> + bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri)?> id", $bug->title, '', "class='preview'", true, true);?> bug->statusList[$bug->status];?> id]", $lang->task->priList, 3, "class='input-sm form-control'");?> diff --git a/module/project/view/importtask.html.php b/module/project/view/importtask.html.php index cb00b4a13a..8b5e9a3072 100644 --- a/module/project/view/importtask.html.php +++ b/module/project/view/importtask.html.php @@ -49,7 +49,7 @@ project], 2);?> - pri?>'>pri;?> + task->priList, $task->pri, $task->pri)?>'>task->priList, $task->pri, $task->pri);?> id", $task->name)) echo $task->name;?> >assignedToRealName;?> left;?> diff --git a/module/project/view/linkstory.html.php b/module/project/view/linkstory.html.php index 0524e92618..2b69663c52 100644 --- a/module/project/view/linkstory.html.php +++ b/module/project/view/linkstory.html.php @@ -43,7 +43,7 @@ id);?> - story->priList[$story->pri]?>'>story->priList[$story->pri];?> + story->priList, $story->pri, $story->pri)?>'>story->priList, $story->pri, $story->pri);?> createLink('product', 'browse', "productID=$story->product"), $products[$story->product], '_blank');?> title);?> planTitle;?> diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index 1dc09320d8..51cc27c42a 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -63,7 +63,7 @@ id));?> - story->priList[$story->pri]?>'>story->priList[$story->pri];?> + story->priList, $story->pri, $story->pri)?>'>story->priList, $story->pri, $story->pri);?> title);?> openedBy];?> assignedTo];?> diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index e615a63f62..6398d7bc8c 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -75,7 +75,7 @@ id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?> - task->priList[$task->pri]?>'>task->priList[$task->pri];?> + task->priList, $task->pri, $task->pri)?>'>task->priList, $task->pri, $task->pri);?> id", $task->name)) echo $task->name; diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 907131fe28..59c0a8c77a 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -101,7 +101,7 @@ createLink('story', 'view', "storyID=$story->id", '', true);?> id);?> - story->priList[$story->pri]?>'>story->priList[$story->pri];?> + story->priList, $story->pri, $story->pri)?>'>story->priList, $story->pri, $story->pri);?> title, '', "class='preview'");?> openedBy];?> estimate;?> diff --git a/module/story/view/zerocase.html.php b/module/story/view/zerocase.html.php index 14a217d905..a19a5f034b 100644 --- a/module/story/view/zerocase.html.php +++ b/module/story/view/zerocase.html.php @@ -42,7 +42,7 @@ id)); else printf('%03d', $story->id);?> - story->priList[$story->pri];?>'>story->priList[$story->pri]?> + story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri)?> title);?> planTitle;?> story->sourceList[$story->source];?> diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 82e4c0d1e9..7fa8df6b48 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -64,7 +64,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete); id));?> - pri?>'>pri?> + testcase->priList, $case->pri, $case->pri)?>'>testcase->priList, $case->pri, $case->pri);?> title);?> createLink('story', 'view', "storyID=$case->story"), $case->storyTitle, '_blank');?> diff --git a/module/testcase/view/groupcase.html.php b/module/testcase/view/groupcase.html.php index 2adc22f243..eafca114e6 100644 --- a/module/testcase/view/groupcase.html.php +++ b/module/testcase/view/groupcase.html.php @@ -40,7 +40,7 @@  id . $lang->colon; if(!common::printLink('testcase', 'view', "case=$case->id", $case->title)) echo $case->title;?> - pri?>'>pri;?> + testcase->priList, $case->pri, $case->pri)?>'>testcase->priList, $case->pri, $case->pri);?> case->typeList[$case->type];?> lastRunner];?> lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?> diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index 175cd8344f..a0e224b496 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -62,7 +62,7 @@ var moduleID = ''; case);?> - pri?>'>pri?> + testcase->priList, $run->pri, $run->pri)?>'>testcase->priList, $run->pri, $run->pri)?> createLink('testcase', 'view', "caseID=$run->case&version=$run->version&from=testtask"), $run->title, '_blank');?> testcase->typeList[$run->type];?> diff --git a/module/testtask/view/groupcase.html.php b/module/testtask/view/groupcase.html.php index 2c9adf8a8b..6a5cead17c 100644 --- a/module/testtask/view/groupcase.html.php +++ b/module/testtask/view/groupcase.html.php @@ -41,7 +41,7 @@  id . $lang->colon; if(!common::printLink('testcase', 'view', "case=$case->id", $case->title)) echo $case->title;?> - pri?>'>pri;?> + testcase->priList, $case->pri, $case->pri)?>'>testcase->priList, $case->pri, $case->pri);?> case->typeList[$case->type];?> assignedTo];?> lastRunner];?> diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php index 790624a015..a25d342f7c 100644 --- a/module/testtask/view/linkcase.html.php +++ b/module/testtask/view/linkcase.html.php @@ -57,7 +57,7 @@ createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?> id]", array_combine(range($case->version, 1), range($case->version, 1)), '', 'class="form-control input-sm" style="padding: 0 5px; height: 20px"');?> - pri?>'>pri?> + testcase->priList, $case->pri, $case->pri)?>'>testcase->priList, $case->pri, $case->pri)?> title . ' ( '; diff --git a/module/user/view/bug.html.php b/module/user/view/bug.html.php index 36a929579a..73973b4133 100644 --- a/module/user/view/bug.html.php +++ b/module/user/view/bug.html.php @@ -40,8 +40,8 @@ createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?> - bug->severityList[$bug->severity]?> - bug->priList[$bug->pri]?>'>bug->priList[$bug->pri]?> + bug->severityList, $bug->severity, $bug->severity)?>'>bug->severityList, $bug->severity, $bug->severity)?> + bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri)?> bug->typeList[$bug->type]?> createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?> openedBy];?> diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php index 25c2898d9b..f8609844d6 100644 --- a/module/user/view/story.html.php +++ b/module/user/view/story.html.php @@ -42,7 +42,7 @@ createLink('story', 'view', "id=$story->id");?> id));?> - pri;?>'>pri?> + story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> productTitle;?> title);?> planTitle;?> diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php index 31d2b6bf4a..f2ede74e17 100644 --- a/module/user/view/task.html.php +++ b/module/user/view/task.html.php @@ -42,7 +42,7 @@ createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?> - task->priList[$task->pri];?>'>task->priList[$task->pri]?> + task->priList, $task->pri, $task->pri);?>'>task->priList, $task->pri, $task->pri)?> createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?> createLink('task', 'view', "taskID=$task->id"), $task->name);?> estimate;?> diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php index fdedea6847..35d5a91915 100755 --- a/module/user/view/testcase.html.php +++ b/module/user/view/testcase.html.php @@ -44,14 +44,14 @@ createLink('testcase', 'view', "testcaseID=$case->id"), sprintf('%03d', $case->id));?> - pri?>'>pri?> + testcase->priList, $case->pri, $case->pri)?>'>testcase->priList, $case->pri, $case->pri)?> createLink('testcase', 'view', "testcaseID=$case->id"), $case->title);?> testcase->typeList[$case->type];?> openedBy];?> lastRunner];?> lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?> lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> - testcase->statusList[$case->status];?> + testcase->statusList[$case->status];?> diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php index 5b2c65aa2e..61e0432098 100644 --- a/module/user/view/todo.html.php +++ b/module/user/view/todo.html.php @@ -47,7 +47,7 @@ id;?> date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?> todo->typeList[$todo->type];?> - pri;?>'>pri?> + todo->priList, $todo->pri, $todo->pri);?>'>todo->priList, $todo->pri, $todo->pri);?> createLink('todo', 'view', "id=$todo->id", '', true), $todo->name, '', "class='colorbox'");?> begin;?> end;?>