From 057bdfe882d6624d64c85faef5e02424595888a6 Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Wed, 9 Sep 2020 15:00:26 +0300
Subject: [PATCH] fix MR comments

---
 app/controllers/{ => admin}/account_locks_controller.rb | 6 +++---
 app/views/admin/accounts/_account.html.erb              | 4 ++--
 config/routes.rb                                        | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename app/controllers/{ => admin}/account_locks_controller.rb (78%)

diff --git a/app/controllers/account_locks_controller.rb b/app/controllers/admin/account_locks_controller.rb
similarity index 78%
rename from app/controllers/account_locks_controller.rb
rename to app/controllers/admin/account_locks_controller.rb
index 6faa02d..21aa3bd 100644
--- a/app/controllers/account_locks_controller.rb
+++ b/app/controllers/admin/account_locks_controller.rb
@@ -1,4 +1,4 @@
-class AccountLocksController < ApplicationController
+class Admin::AccountLocksController < Admin::ApplicationController
   before_action :set_account
 
   def create
@@ -16,8 +16,8 @@ class AccountLocksController < ApplicationController
   private
 
   def set_account
-    if params[:id].present?
-      @account = Account.find(params[:id])
+    if params[:account_id].present?
+      @account = Account.find_by(slug: params[:account_id])
     else
       failure_redirect
     end
diff --git a/app/views/admin/accounts/_account.html.erb b/app/views/admin/accounts/_account.html.erb
index ce60777..bc761b7 100644
--- a/app/views/admin/accounts/_account.html.erb
+++ b/app/views/admin/accounts/_account.html.erb
@@ -31,9 +31,9 @@
         <%= link_to fa_icon("pencil", text: "Edit"), edit_admin_account_path(account), class: "dropdown-item" %>
         <%= link_to fa_icon("arrow-right", text: "Account Managers"), account_auths_path({ account_id: account.id}), class: "dropdown-item" %>
         <% if account.locked? %>
-          <%= link_to fa_icon("unlock", text: "Unlock Account"), [:account, :lock, id: account.id], method: :delete, class: "dropdown-item" %>
+          <%= link_to fa_icon("unlock", text: "Unlock Account"), [:admin, account, :lock], method: :delete, class: "dropdown-item" %>
         <% else %>
-          <%= link_to fa_icon("lock", text: "Lock Account"), [:account, :lock, id: account.id], method: :post, class: "dropdown-item" %>
+          <%= link_to fa_icon("lock", text: "Lock Account"), [:admin, account, :lock], method: :post, class: "dropdown-item" %>
         <% end %>
       </div>
     </div>
diff --git a/config/routes.rb b/config/routes.rb
index 6f0e64f..4ef5dbe 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -30,7 +30,9 @@ Rails.application.routes.draw do
     namespace :admin do
       mount Sidekiq::Web => '/background_queue', as: :background_queue
 
-      resources :accounts, only: [:index, :new, :create, :edit, :update, :show]
+      resources :accounts, only: [:index, :new, :create, :edit, :update, :show] do
+        resource :account_lock, path: :lock, as: :lock, only: [:create, :destroy]
+      end
       resources :users, only: [:index, :new, :create, :edit, :update, :destroy] do
         resource :masquerade, only: :create
       end
@@ -49,7 +51,6 @@ Rails.application.routes.draw do
     resource :account_session, only: [:update]
     resource :session, only: [:destroy]
     resource :account, only: [:new, :create, :update] do
-      resource :account_locks, path: :lock, as: :lock, only: [:create, :destroy]
       get 'locked' => 'locked_accounts#index'
     end
     resources :account_auths, only: [:index, :create, :update, :destroy]