Upstream sync

This commit is contained in:
Senad Uka
2020-09-13 20:09:48 +02:00
parent 3db230de9b
commit 5cf7be6f13
59 changed files with 613 additions and 188 deletions

View File

@@ -1651,3 +1651,6 @@ en:
edit: Edit
report: Report
generating: Generating...
locked_accounts:
index:
account_locked_message: This account is locked. Please contact a BIG admin.

View File

@@ -705,3 +705,6 @@ es:
production_elements_logs: Production Elements Logs, and more (ES)
reduces_labor_cost: Reduces labor costs (ES)
simplifies_cue_sheets: Simplifies Music Cue Sheets, Graphic Cue Sheets (ES)
locked_accounts:
index:
account_locked_message: This account is locked. Please contact a BIG admin. (ES)

View File

@@ -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
@@ -48,7 +50,9 @@ Rails.application.routes.draw do
scope "(:locale)", locale: AVAILABLE_LOCALES_REGEX do
resource :account_session, only: [:update]
resource :session, only: [:destroy]
resource :account, only: [:new, :create, :update]
resource :account, only: [:new, :create, :update] do
get 'locked' => 'locked_accounts#index'
end
resources :account_auths, only: [:index, :create, :update, :destroy]
resources :projects, shallow: true do
resources :acquired_media_releases, except: [:show], concerns: [:contractable, :notable, :file_uploadable]