Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
OHR Support
Manage
Activity
Members
Labels
Plan
Issues
97
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Projects
OHR Support
Commits
9cb4feef
Commit
9cb4feef
authored
13 years ago
by
Felix Schäfer
Committed by
Gregor Schmidt
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Update the watcher list on click on "watch".
#311
Based on a patch contributed by Price M.
parent
0957e478
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/controllers/watchers_controller.rb
+6
-1
6 additions, 1 deletion
app/controllers/watchers_controller.rb
app/views/issues/_action_menu.rhtml
+1
-1
1 addition, 1 deletion
app/views/issues/_action_menu.rhtml
with
7 additions
and
2 deletions
app/controllers/watchers_controller.rb
+
6
−
1
View file @
9cb4feef
...
...
@@ -90,7 +90,12 @@ private
format
.
js
do
render
(
:update
)
do
|
page
|
replace_ids
.
each
do
|
replace_id
|
page
.
replace_html
replace_id
,
watcher_link
(
@watched
,
user
,
:replace
=>
replace_ids
)
case
replace_id
when
'watchers'
page
.
replace_html
'watchers'
,
:partial
=>
'watchers/watchers'
,
:locals
=>
{
:watched
=>
@watched
}
else
page
.
replace_html
replace_id
,
watcher_link
(
@watched
,
user
,
:replace
=>
replace_ids
)
end
end
end
end
...
...
This diff is collapsed.
Click to expand it.
app/views/issues/_action_menu.rhtml
+
1
−
1
View file @
9cb4feef
...
...
@@ -2,7 +2,7 @@
<%=
link_to_if_authorized
(
l
(
:button_update
),
{
:controller
=>
'issues'
,
:action
=>
'edit'
,
:id
=>
@issue
},
:onclick
=>
'showAndScrollTo("update", "notes"); return false;'
,
:class
=>
'icon icon-edit'
,
:accesskey
=>
accesskey
(
:edit
))
%>
<%=
link_to_if_authorized
l
(
:button_log_time
),
{
:controller
=>
'timelog'
,
:action
=>
'new'
,
:issue_id
=>
@issue
},
:class
=>
'icon icon-time-add'
%>
<%
replace_watcher
||=
'watcher'
%>
<%=
watcher_tag
(
@issue
,
User
.
current
,
{
:id
=>
replace_watcher
,
:replace
=>
[
'watcher'
,
'watcher2'
]})
%>
<%=
watcher_tag
(
@issue
,
User
.
current
,
{
:id
=>
replace_watcher
,
:replace
=>
[
'
watchers'
,
'
watcher'
,
'watcher2'
]})
%>
<%=
link_to_if_authorized
l
(
:button_duplicate
),
{
:controller
=>
'issues'
,
:action
=>
'new'
,
:project_id
=>
@project
,
:copy_from
=>
@issue
},
:class
=>
'icon icon-duplicate'
%>
<%=
link_to_if_authorized
l
(
:button_copy
),
{
:controller
=>
'issue_moves'
,
:action
=>
'new'
,
:id
=>
@issue
,
:copy_options
=>
{
:copy
=>
't'
}},
:class
=>
'icon icon-copy'
%>
<%=
link_to_if_authorized
l
(
:button_move
),
{
:controller
=>
'issue_moves'
,
:action
=>
'new'
,
:id
=>
@issue
},
:class
=>
'icon icon-move'
%>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment