Merge pull request #5437 from AntonKhorev/user-status-resource

[rails.git] / app / controllers / users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 904b960a28e157ec9c7484179debcd4efa3d637e..a0be87bdc11fa6417601b6e278030fc673825515 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -14,7 +14,6 @@ class UsersController < ApplicationController
 
   before_action :check_database_writable, :only => [:new, :go_public]
   before_action :require_cookies, :only => [:new]
 
   before_action :check_database_writable, :only => [:new, :go_public]
   before_action :require_cookies, :only => [:new]

-  before_action :lookup_user_by_name, :only => [:set_status, :destroy]

 
   allow_thirdparty_images :only => :show
   allow_social_login :only => :new
 
   allow_thirdparty_images :only => :show
   allow_social_login :only => :new


@@ -98,13 +97,6 @@ class UsersController < ApplicationController
     end
   end
 
     end
   end
 

-  ##
-  # destroy a user, marking them as deleted and removing personal data
-  def destroy
-    @user.soft_destroy!
-    redirect_to user_path(:display_name => params[:display_name])
-  end
-

   def go_public
     current_user.data_public = true
     current_user.save
   def go_public
     current_user.data_public = true
     current_user.save


@@ -112,18 +104,6 @@ class UsersController < ApplicationController
     redirect_to edit_account_path
   end
 
     redirect_to edit_account_path
   end
 

-  ##
-  # sets a user's status
-  def set_status
-    @user.activate! if params[:event] == "activate"
-    @user.confirm! if params[:event] == "confirm"
-    @user.unconfirm! if params[:event] == "unconfirm"
-    @user.hide! if params[:event] == "hide"
-    @user.unhide! if params[:event] == "unhide"
-    @user.unsuspend! if params[:event] == "unsuspend"
-    redirect_to user_path(:display_name => params[:display_name])
-  end
-

   ##
   # omniauth success callback
   def auth_success
   ##
   # omniauth success callback
   def auth_success


@@ -237,14 +217,6 @@ class UsersController < ApplicationController
     end
   end
 
     end
   end
 

-  ##
-  # ensure that there is a "user" instance variable
-  def lookup_user_by_name
-    @user = User.find_by(:display_name => params[:display_name])
-  rescue ActiveRecord::RecordNotFound
-    redirect_to :action => "view", :display_name => params[:display_name] unless @user
-  end
-

   ##
   # return permitted user parameters
   def user_params
   ##
   # return permitted user parameters
   def user_params