Fix #2851: Account deletion should remove name change requests.
Hides name change requests for deleted users (username matches /user_[0-9]+~*/).
This commit is contained in:
@@ -8,18 +8,18 @@ class UserFeedbacksController < ApplicationController
|
||||
end
|
||||
|
||||
def edit
|
||||
@user_feedback = UserFeedback.find(params[:id])
|
||||
@user_feedback = UserFeedback.visible.find(params[:id])
|
||||
check_privilege(@user_feedback)
|
||||
respond_with(@user_feedback)
|
||||
end
|
||||
|
||||
def show
|
||||
@user_feedback = UserFeedback.find(params[:id])
|
||||
@user_feedback = UserFeedback.visible.find(params[:id])
|
||||
respond_with(@user_feedback)
|
||||
end
|
||||
|
||||
def index
|
||||
@search = UserFeedback.search(params[:search])
|
||||
@search = UserFeedback.visible.search(params[:search])
|
||||
@user_feedbacks = @search.paginate(params[:page], :limit => params[:limit]).order("created_at desc")
|
||||
respond_with(@user_feedbacks) do |format|
|
||||
format.xml do
|
||||
@@ -34,14 +34,14 @@ class UserFeedbacksController < ApplicationController
|
||||
end
|
||||
|
||||
def update
|
||||
@user_feedback = UserFeedback.find(params[:id])
|
||||
@user_feedback = UserFeedback.visible.find(params[:id])
|
||||
check_privilege(@user_feedback)
|
||||
@user_feedback.update_attributes(params[:user_feedback])
|
||||
respond_with(@user_feedback)
|
||||
end
|
||||
|
||||
def destroy
|
||||
@user_feedback = UserFeedback.find(params[:id])
|
||||
@user_feedback = UserFeedback.visible.find(params[:id])
|
||||
check_privilege(@user_feedback)
|
||||
@user_feedback.destroy
|
||||
respond_with(@user_feedback)
|
||||
|
||||
Reference in New Issue
Block a user