[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [websites/bugs-kde-org/develop] template/en/custom: integrate upstream template changes
From: Ingo Malchow <imalchow () kde ! org>
Date: 2013-03-31 22:26:25
Message-ID: 20130331222625.2F489A6059 () git ! kde ! org
[Download RAW message or body]
Git commit 289da52418bb70b2ae788d94d52615b7f1128517 by Ingo Malchow.
Committed on 01/04/2013 at 00:26.
Pushed by imalchow into branch 'develop'.
integrate upstream template changes
M +3 -0 template/en/custom/admin/params/groupsecurity.html.tmpl
M +1 -1 template/en/custom/bug/create/create.html.tmpl
M +1 -0 template/en/custom/bug/field-events.js.tmpl
M +1 -1 template/en/custom/bug/field-help.none.tmpl
M +1 -1 template/en/custom/global/header.html.tmpl
M +5 -0 template/en/custom/global/user-error.html.tmpl
M +33 -0 template/en/custom/pages/release-notes.html.tmpl
http://commits.kde.org/websites/bugs-kde-org/289da52418bb70b2ae788d94d52615b7f1128517
diff --git a/template/en/custom/admin/params/groupsecurity.html.tmpl \
b/template/en/custom/admin/params/groupsecurity.html.tmpl index ab39a91..f4d6a5a \
100644
--- a/template/en/custom/admin/params/groupsecurity.html.tmpl
+++ b/template/en/custom/admin/params/groupsecurity.html.tmpl
@@ -41,6 +41,9 @@
querysharegroup => "The name of the group of users who can share their " _
"saved searches with others.",
+
+ debug_group => "The name of the group of users who can view the actual " _
+ "SQL query generated when viewing $terms.bug lists and reports.",
usevisibilitygroups => "Do you wish to restrict visibility of users to members of \
" _ "specific groups?",
diff --git a/template/en/custom/bug/create/create.html.tmpl \
b/template/en/custom/bug/create/create.html.tmpl index 9e25229..3edfa31 100644
--- a/template/en/custom/bug/create/create.html.tmpl
+++ b/template/en/custom/bug/create/create.html.tmpl
@@ -301,7 +301,7 @@ TUI_hide_default('attachment_text_field');
bug = default, field = bug_fields.op_sys, editable = 1,
value = default.op_sys %]
</tr>
- [% IF !Param('defaultplatform') || !Param('defaultopsys') %]
+ [% IF (!Param('defaultplatform') || !Param('defaultopsys')) && !cloned_bug_id %]
<tr>
<th colspan="3"> </th>
<td id="os_guess_note" class="comment">
diff --git a/template/en/custom/bug/field-events.js.tmpl \
b/template/en/custom/bug/field-events.js.tmpl index ccc9f52..e31c72a 100644
--- a/template/en/custom/bug/field-events.js.tmpl
+++ b/template/en/custom/bug/field-events.js.tmpl
@@ -54,6 +54,7 @@
[% FOREACH controlled_field = legal_value.controlled_values.keys %]
[% SET cont_ids = [] %]
[% FOREACH val = legal_value.controlled_values.$controlled_field %]
+ [% NEXT IF !val.is_active %]
[% cont_ids.push(val.id) %]
[% END %]
[% NEXT IF !cont_ids.size %]
diff --git a/template/en/custom/bug/field-help.none.tmpl \
b/template/en/custom/bug/field-help.none.tmpl index 7ae9991..a9449fb 100644
--- a/template/en/custom/bug/field-help.none.tmpl
+++ b/template/en/custom/bug/field-help.none.tmpl
@@ -91,7 +91,7 @@ estimated_time =>
keywords =>
"You can add keywords from a defined list to $terms.bugs, in order"
- _ " to tag and group them.",
+ _ " to easily identify and group them.",
longdesc =>
"$terms.Bugs have comments added to them by $terms.Bugzilla users."
diff --git a/template/en/custom/global/header.html.tmpl \
b/template/en/custom/global/header.html.tmpl index 3a0e4d0..56b0d15 100644
--- a/template/en/custom/global/header.html.tmpl
+++ b/template/en/custom/global/header.html.tmpl
@@ -240,7 +240,7 @@
# but set the onload attribute in the DEFAULT directive above.
#%]
<body onload="[% onload %]"
- class="no-js [% \
urlbase.replace('^https?://','').replace('/$','').replace('[-~@:/.]+','-') %] + \
class="no-js [% urlbase.replace('^https?://','').replace('/$','').replace('[-~@:/.]+','-') \
FILTER css_class_quote %] [% FOREACH class = bodyclasses %]
[% ' ' %][% class FILTER css_class_quote %]
[% END %] yui-skin-sam">
diff --git a/template/en/custom/global/user-error.html.tmpl \
b/template/en/custom/global/user-error.html.tmpl index 93f03c2..2e76f91 100644
--- a/template/en/custom/global/user-error.html.tmpl
+++ b/template/en/custom/global/user-error.html.tmpl
@@ -1638,6 +1638,11 @@
[% ELSIF error == "unknown_tab" %]
[% title = "Unknown Tab" %]
<code>[% current_tab_name FILTER html %]</code> is not a legal tab name.
+
+ [% ELSIF error == "value_inactive" %]
+ [% title = "Value is Not Active" %]
+ [% type = BLOCK %][% INCLUDE object_name class = class %][% END %]
+ The [% type FILTER html %] value '[% value FILTER html %]' is not active.
[% ELSIF error == "version_already_exists" %]
[% title = "Version Already Exists" %]
diff --git a/template/en/custom/pages/release-notes.html.tmpl \
b/template/en/custom/pages/release-notes.html.tmpl index 469305c..fdf0340 100644
--- a/template/en/custom/pages/release-notes.html.tmpl
+++ b/template/en/custom/pages/release-notes.html.tmpl
@@ -53,6 +53,39 @@
<h2 id="v42_point">Updates in this 4.2.x Release</h2>
+h3>4.2.5</h3>
+
+<p>This release fixes one security issue. See the
+ <a href="http://www.bugzilla.org/security/3.6.12/">Security Advisory</a>
+ for details.</p>
+
+<p>In addition, the following important fixes/changes have been made in this
+ release:</p>
+
+<ul>
+ <li>Queries involving commenters were slow to return results. These queries
+ have been optimized for better performance.
+ (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=818007">[% terms.Bug %] \
818007</a>)</li> + <li>It is no longer possible to create a new [% terms.bug %] \
using a disabled + component, target milestone or version. These inactive values \
are also no + longer accessible when moving [% terms.abug %] into another product.
+ ([% terms.Bugs %] <a \
href="https://bugzilla.mozilla.org/show_bug.cgi?id=752946">752946</a> + and <a \
href="https://bugzilla.mozilla.org/show_bug.cgi?id=840824">840824</a>)</li> + <li>It \
was possible to create a new [% terms.bug %] with no description + despite the \
status workflow required one for new [% terms.bugs %]. + (<a \
href="https://bugzilla.mozilla.org/show_bug.cgi?id=818890">[% terms.Bug %] \
818890</a>)</li> + <li>Custom multi-select fields are now available in the "Search \
By Change + History" section of the "Advanced Search" page.
+ (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=839950">[% terms.Bug %] \
839950</a>)</li> + <li>A custom select field could have its list of values truncated \
if one + or more of its values were disabled and the visibility of the values were
+ controlled by another field.
+ (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=806809">[% terms.Bug %] \
806809</a>)</li> + <li>Warnings thrown by Return::Value 1.666002 about this \
deprecated module + and which are polluting the web server error log are now \
disabled. + (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=826678">[% \
terms.Bug %] 826678</a>)</li> +</ul>
+
<h3>4.2.4</h3>
<p>This release fixes several security issues. See the
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic