Skip to content

Commit

Permalink
Merge pull request #13445 from saraycp/remove_toggle_watch
Browse files Browse the repository at this point in the history
Remove ProjectController#toggle_watch method
  • Loading branch information
saraycp committed Dec 1, 2022
2 parents 1ee40b7 + 65c4c9f commit 842c83e
Show file tree
Hide file tree
Showing 25 changed files with 770 additions and 83 deletions.
23 changes: 3 additions & 20 deletions src/api/app/controllers/webui/project_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ class Webui::ProjectController < Webui::WebuiController

before_action :lockout_spiders, only: [:requests, :buildresults]

before_action :require_login, only: [:create, :toggle_watch, :destroy, :new, :release_request,
before_action :require_login, only: [:create, :destroy, :new, :release_request,
:new_release_request, :edit_comment]

before_action :set_project, only: [:autocomplete_repositories, :users, :subprojects,
:edit, :release_request,
:show, :buildresult,
:destroy, :remove_path_from_target,
:requests, :save, :monitor, :toggle_watch,
:edit_comment,
:requests, :save, :monitor, :edit_comment,
:unlock, :save_person, :save_group, :remove_role,
:move_path, :clear_failed_comment, :pulse,
:keys_and_certificates]
Expand All @@ -27,7 +26,7 @@ class Webui::ProjectController < Webui::WebuiController
after_action :verify_authorized, except: [:index, :autocomplete_projects, :autocomplete_incidents, :autocomplete_packages,
:autocomplete_repositories, :users, :subprojects, :new, :show,
:buildresult, :requests, :monitor, :new_release_request,
:remove_target_request, :toggle_watch, :edit_comment, :edit_comment_form,
:remove_target_request, :edit_comment, :edit_comment_form,
:keys_and_certificates]

def index
Expand Down Expand Up @@ -323,22 +322,6 @@ def monitor
@repoarray = repohash.sort
end

def toggle_watch
if User.session!.watches?(@project.name)
logger.debug "Remove #{@project} from watchlist for #{User.session!}"
User.session!.remove_watched_project(@project.name)
else
logger.debug "Add #{@project} to watchlist for #{User.session!}"
User.session!.add_watched_project(@project.name)
end

if request.env['HTTP_REFERER']
redirect_back(fallback_location: root_path)
else
redirect_to action: :show, project: @project
end
end

def clear_failed_comment
# FIXME: This should authorize destroy for all the attributes
authorize @project, :update?
Expand Down
1 change: 0 additions & 1 deletion src/api/config/routes/webui_routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@
"/project/monitor/#{request.query_parameters[:project]}#{url_string}"
}, constraints: ->(request) { request.query_parameters['project'].present? }
# TODO: this should be POST (and the link AJAX)
get 'project/toggle_watch/:project' => :toggle_watch, constraints: cons, as: 'project_toggle_watch'
get 'project/clear_failed_comment/:project' => :clear_failed_comment, constraints: cons, as: :clear_failed_comment
get 'project/edit_comment_form/:project' => :edit_comment_form, constraints: cons, as: :edit_comment_form
post 'project/edit_comment/:project' => :edit_comment, constraints: cons
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 842c83e

Please sign in to comment.