From f51570e3f8605c2f1ffc927cf6263adc1f560e81 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Thu, 17 May 2007 20:10:52 +0000 Subject: Bug 377485: Implement editworkflow.cgi - Patch by Frédéric Buclin r=gerv r=mkanat a=mkanat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../en/default/admin/workflow/comment.html.tmpl | 93 ++++++++++++++++++++++ template/en/default/admin/workflow/edit.html.tmpl | 93 ++++++++++++++++++++++ template/en/default/filterexceptions.pl | 10 +++ template/en/default/global/messages.html.tmpl | 5 +- template/en/default/global/user-error.html.tmpl | 4 +- 5 files changed, 203 insertions(+), 2 deletions(-) create mode 100644 template/en/default/admin/workflow/comment.html.tmpl create mode 100644 template/en/default/admin/workflow/edit.html.tmpl (limited to 'template') diff --git a/template/en/default/admin/workflow/comment.html.tmpl b/template/en/default/admin/workflow/comment.html.tmpl new file mode 100644 index 000000000..5e9a788d6 --- /dev/null +++ b/template/en/default/admin/workflow/comment.html.tmpl @@ -0,0 +1,93 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # Contributor(s): Frédéric Buclin + # Gervase Markham + #%] + +[% PROCESS "global/field-descs.none.tmpl" %] + +[% INCLUDE global/header.html.tmpl + title = "Edit Actions Triggered by the Workflow" + style_urls = ['skins/standard/admin.css'] +%] + + + +

+ This page allows you to define which status transitions require a comment + by the user doing the change. +

+ +
+ + + + + + + + + + [% FOREACH status = statuses %] + + [% END %] + + + [%# This defines the entry point in the workflow %] + [% p = [{id => 0, value => "{Start}", is_open => 1}] %] + [% FOREACH status = p.merge(statuses) %] + + + + [% FOREACH new_status = statuses %] + [% IF workflow.${status.id}.${new_status.id}.defined %] + + [% ELSE %] + + [% END %] + [% END %] + + [% END %] +
 To
From  + [% status.value FILTER html %] +
+ [% status.value FILTER html %] + + +  
+ +

+ + + - + Cancel Changes - + View Current Workflow +

+ +
+ +[% INCLUDE global/footer.html.tmpl %] diff --git a/template/en/default/admin/workflow/edit.html.tmpl b/template/en/default/admin/workflow/edit.html.tmpl new file mode 100644 index 000000000..dee71c0a1 --- /dev/null +++ b/template/en/default/admin/workflow/edit.html.tmpl @@ -0,0 +1,93 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # Contributor(s): Frédéric Buclin + # Gervase Markham + #%] + +[% PROCESS "global/field-descs.none.tmpl" %] + +[% INCLUDE global/header.html.tmpl + title = "Edit Workflow" + style_urls = ['skins/standard/admin.css'] +%] + + + +

+ This page allows you to define which status transitions are valid + in your workflow. +

+ +
+ + + + + + + + + + [% FOREACH status = statuses %] + + [% END %] + + + [%# This defines the entry point in the workflow %] + [% p = [{id => 0, value => "{Start}", is_open => 1}] %] + [% FOREACH status = p.merge(statuses) %] + + + + [% FOREACH new_status = statuses %] + [% IF status.id != new_status.id %] + + [% ELSE %] + + [% END %] + [% END %] + + [% END %] +
 To
From  + [% status.value FILTER html %] +
+ [% status.value FILTER html %] + + +  
+ +

+ + + - + Cancel Changes - + View Current Triggers +

+ +
+ +[% INCLUDE global/footer.html.tmpl %] diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index ac579115b..ed3d72503 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -543,6 +543,16 @@ 'comp.bug_count' ], +'admin/workflow/edit.html.tmpl' => [ + 'status.id', + 'new_status.id', +], + +'admin/workflow/comment.html.tmpl' => [ + 'status.id', + 'new_status.id', +], + 'account/login.html.tmpl' => [ 'target', ], diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 11fe0733c..3673a8d6e 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -491,7 +491,10 @@ You entered a username that matched more than one user, so we have instead left the [% match_field FILTER html %] field blank. - + + [% ELSIF message_tag == "workflow_updated" %] + The workflow has been updated. + [% ELSE %] [%# Give sensible error if error functions are used incorrectly. #%] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 4fa138206..485f7c403 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -189,7 +189,7 @@ [% ELSIF object == "settings" %] settings [% ELSIF object == "sudo_session" %] - an sudo session + a sudo session [% ELSIF object == "timetracking_summaries" %] time-tracking summary reports [% ELSIF object == "user" %] @@ -198,6 +198,8 @@ users [% ELSIF object == "versions" %] versions + [% ELSIF object == "workflow" %] + the workflow [% END %]. [% Hook.process("auth_failure") %] -- cgit v1.2.3-24-g4f1b