summaryrefslogtreecommitdiffstats
path: root/extensions/TryAutoLand/template/en/default
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-03-29 21:58:58 +0200
committerDave Lawrence <dlawrence@mozilla.com>2012-03-29 21:58:58 +0200
commit64204296d23ca9983b7a39b11e0c3bed4b23f8a2 (patch)
tree2f2603f31d68c00983db721ee33f7a6dcd30e371 /extensions/TryAutoLand/template/en/default
parent0db5834ed0c2f4c14611e3af54f5017da259b092 (diff)
downloadbugzilla-64204296d23ca9983b7a39b11e0c3bed4b23f8a2.tar.gz
bugzilla-64204296d23ca9983b7a39b11e0c3bed4b23f8a2.tar.xz
Bug 740177 - Update the TryAutoLand WebService to allow removal of autoland patches
r=glob
Diffstat (limited to 'extensions/TryAutoLand/template/en/default')
-rw-r--r--extensions/TryAutoLand/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl2
-rw-r--r--extensions/TryAutoLand/template/en/default/hook/global/user-error-errors.html.tmpl11
2 files changed, 9 insertions, 4 deletions
diff --git a/extensions/TryAutoLand/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl b/extensions/TryAutoLand/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
index f9bb8ef5e..ed6224afe 100644
--- a/extensions/TryAutoLand/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
+++ b/extensions/TryAutoLand/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
@@ -6,7 +6,7 @@
# defined by the Mozilla Public License, v. 2.0.
#%]
-[% IF user.in_group('hg-try') %]
+[% IF user.in_group('autoland') %]
[% autoland_attachments = [] %]
[% autoland_waiting = 0 %]
[% autoland_running = 0 %]
diff --git a/extensions/TryAutoLand/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/TryAutoLand/template/en/default/hook/global/user-error-errors.html.tmpl
index b2aac99fe..c12950dcf 100644
--- a/extensions/TryAutoLand/template/en/default/hook/global/user-error-errors.html.tmpl
+++ b/extensions/TryAutoLand/template/en/default/hook/global/user-error-errors.html.tmpl
@@ -9,7 +9,8 @@
[% IF error == "autoland_invalid_status" %]
[% title = "AutoLand Invalid Status" %]
The status '[% status FILTER html %]' is not a valid
- status for the AutoLand extension.
+ status for the AutoLand extension. Valid statuses
+ are [% valid.join(', ') FILTER html %].
[% ELSIF error == "autoland_invalid_attach_id" %]
[% title = "AutoLand Invalid Attachment ID" %]
@@ -17,12 +18,16 @@
a valid id for the AutoLand extension.
[% ELSIF error == "autoland_empty_try_syntax" %]
- [% title = "Autoland Empty Try Syntax" %]
+ [% title = "AutoLand Empty Try Syntax" %]
You cannot have a value for Branches and have an empty Try Syntax value.
[% ELSIF error == "autoland_empty_branches" %]
- [% title = "Autoland Empty Branches" %]
+ [% title = "AutoLand Empty Branches" %]
You cannot check one or more patches for AutoLanding and have an empty
Branches value.
+[% ELSIF error == "autoland_update_invalid_action" %]
+ [% title = "AutoLand Update Invalid Action" %]
+ The action '[% action FILTER html %]' is not a valid action.
+ Valid actions are [% valid.join(', ') FILTER html %].
[% END %]