@@ -21,6 +21,7 class ContextMenusController < ApplicationController | |||
|
21 | 21 | |
|
22 | 22 | def issues |
|
23 | 23 | @issues = Issue.visible.all(:conditions => {:id => params[:ids]}, :include => :project) |
|
24 | (render_404; return) unless @issues.present? | |
|
24 | 25 | if (@issues.size == 1) |
|
25 | 26 | @issue = @issues.first |
|
26 | 27 | end |
@@ -74,6 +75,8 class ContextMenusController < ApplicationController | |||
|
74 | 75 | def time_entries |
|
75 | 76 | @time_entries = TimeEntry.all( |
|
76 | 77 | :conditions => {:id => params[:ids]}, :include => :project) |
|
78 | (render_404; return) unless @time_entries.present? | |
|
79 | ||
|
77 | 80 | @projects = @time_entries.collect(&:project).compact.uniq |
|
78 | 81 | @project = @projects.first if @projects.size == 1 |
|
79 | 82 | @activities = TimeEntryActivity.shared.active |
@@ -226,6 +226,11 class ContextMenusControllerTest < ActionController::TestCase | |||
|
226 | 226 | assert_equal [1], assigns(:issues).collect(&:id) |
|
227 | 227 | end |
|
228 | 228 | |
|
229 | def test_should_respond_with_404_without_ids | |
|
230 | get :issues | |
|
231 | assert_response 404 | |
|
232 | end | |
|
233 | ||
|
229 | 234 | def test_time_entries_context_menu |
|
230 | 235 | @request.session[:user_id] = 2 |
|
231 | 236 | get :time_entries, :ids => [1, 2] |
General Comments 0
You need to be logged in to leave comments.
Login now