summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorDylan William Hardison [:dylan] <dylan@mozilla.com>2014-06-03 09:57:28 +0200
committerByron Jones <glob@mozilla.com>2014-06-03 09:57:28 +0200
commit1fbae4ef5a9cca5d889a6fed3b930c1c9d641d6e (patch)
tree7145c2d59544d11556cf1817227e7c725d22be10 /template/en
parentc725b6c20ae8157a3a13674755b2de5148a1fe26 (diff)
downloadbugzilla-1fbae4ef5a9cca5d889a6fed3b930c1c9d641d6e.tar.gz
bugzilla-1fbae4ef5a9cca5d889a6fed3b930c1c9d641d6e.tar.xz
Bug 1000917: Backport upstream bug 489028 to bmo/4.2 to allow user last visit searching
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/admin/params/admin.html.tmpl7
-rw-r--r--template/en/default/bug/show-header.html.tmpl5
-rw-r--r--template/en/default/global/field-descs.none.tmpl1
-rw-r--r--template/en/default/global/user-error.html.tmpl5
4 files changed, 16 insertions, 2 deletions
diff --git a/template/en/default/admin/params/admin.html.tmpl b/template/en/default/admin/params/admin.html.tmpl
index dd83ebb2e..f84dbc701 100644
--- a/template/en/default/admin/params/admin.html.tmpl
+++ b/template/en/default/admin/params/admin.html.tmpl
@@ -37,5 +37,8 @@
"$terms.Bugzilla will issue a warning in case you'd run into inconsistencies " _
"when you're about to do so, but such deletions remain kinda scary. " _
"So, you have to turn on this option before any such deletions " _
- "will ever happen." }
-%] \ No newline at end of file
+ "will ever happen."
+
+ last_visit_keep_days => "This option controls how many days $terms.Bugzilla will " _
+ "remember when users visit specific ${terms.bugs}."}
+%]
diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl
index 9f2127d23..306407a65 100644
--- a/template/en/default/bug/show-header.html.tmpl
+++ b/template/en/default/bug/show-header.html.tmpl
@@ -41,6 +41,7 @@
[% yui = ['autocomplete', 'calendar'] %]
[% yui.push('container') IF user.can_tag_comments %]
[% javascript_urls = [ "js/util.js", "js/field.js" ] %]
+[% javascript_urls.push("js/bug.js") IF user.id %]
[% javascript_urls.push('js/comment-tagging.js')
IF user.id && Param('comment_taggers_group') %]
[% IF bug.defined %]
@@ -65,6 +66,10 @@
}
YAHOO.util.Event.onDOMReady(function() {
initDirtyFieldTracking();
+
+ [% IF user.id AND user.is_involved_in_bug(bug) %]
+ YAHOO.bugzilla.bugUserLastVisit.update([% bug.bug_id FILTER none %]);
+ [% END %]
});
[% javascript FILTER none %]
[% END %]
diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index 731ba37ef..721e1dc49 100644
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -111,6 +111,7 @@
"everconfirmed" => "Ever confirmed",
"flagtypes.name" => "Flags",
"keywords" => "Keywords",
+ "last_visit_ts" => "Last Visit",
"longdesc" => "Comment",
"longdescs.count" => "Number of Comments",
"longdescs.isprivate" => "Comment is private",
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 54d0f696a..b04deb4d6 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1817,6 +1817,11 @@
Sorry, but you are not allowed to (un)mark comments or attachments
as private.
+ [% ELSIF error == "user_not_involved" %]
+ [% title = "User Not Involved with $terms.Bug" %]
+ Sorry, but you are not involved with [% terms.Bug %] [%+
+ bug_id FILTER bug_link(bug_id) FILTER none %].
+
[% ELSIF error == "webdot_too_large" %]
[% title = "Dependency Graph Too Large" %]
The dependency graph contains too many [% terms.bugs %] to display (more