mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-10-09 21:36:44 +08:00
Move before actions in RepositoryColumnsController
This commit is contained in:
parent
285280827a
commit
cf9c3be4cf
8 changed files with 21 additions and 32 deletions
|
@ -3,9 +3,6 @@
|
||||||
module RepositoryColumns
|
module RepositoryColumns
|
||||||
class AssetColumnsController < RepositoryColumnsController
|
class AssetColumnsController < RepositoryColumnsController
|
||||||
include InputSanitizeHelper
|
include InputSanitizeHelper
|
||||||
before_action :load_column, only: :update
|
|
||||||
before_action :check_create_permissions, only: :create
|
|
||||||
before_action :check_manage_permissions, only: :update
|
|
||||||
|
|
||||||
def create
|
def create
|
||||||
service = RepositoryColumns::CreateColumnService
|
service = RepositoryColumns::CreateColumnService
|
||||||
|
|
|
@ -2,9 +2,6 @@
|
||||||
|
|
||||||
module RepositoryColumns
|
module RepositoryColumns
|
||||||
class ChecklistColumnsController < RepositoryColumnsController
|
class ChecklistColumnsController < RepositoryColumnsController
|
||||||
before_action :load_column, only: %i(update items)
|
|
||||||
before_action :check_create_permissions, only: :create
|
|
||||||
before_action :check_manage_permissions, only: :update
|
|
||||||
helper_method :delimiters
|
helper_method :delimiters
|
||||||
|
|
||||||
def create
|
def create
|
||||||
|
@ -47,7 +44,7 @@ module RepositoryColumns
|
||||||
private
|
private
|
||||||
|
|
||||||
def search_params
|
def search_params
|
||||||
params.permit(:query, :column_id)
|
params.permit(:query, :repository_id, :id)
|
||||||
end
|
end
|
||||||
|
|
||||||
def repository_column_params
|
def repository_column_params
|
||||||
|
|
|
@ -3,15 +3,12 @@
|
||||||
module RepositoryColumns
|
module RepositoryColumns
|
||||||
class DateTimeColumnsController < RepositoryColumnsController
|
class DateTimeColumnsController < RepositoryColumnsController
|
||||||
include InputSanitizeHelper
|
include InputSanitizeHelper
|
||||||
before_action :load_column, only: :update
|
|
||||||
before_action :check_create_permissions, only: :create
|
|
||||||
before_action :check_manage_permissions, only: :update
|
|
||||||
|
|
||||||
def create
|
def create
|
||||||
service = RepositoryColumns::CreateColumnService
|
service = RepositoryColumns::CreateColumnService
|
||||||
.call(user: current_user, repository: @repository, team: current_team,
|
.call(user: current_user, repository: @repository, team: current_team,
|
||||||
column_type: column_type_param,
|
column_type: column_type_param,
|
||||||
params: repository_column_params)
|
params: repository_column_params)
|
||||||
|
|
||||||
if service.succeed?
|
if service.succeed?
|
||||||
render json: service.column, status: :created, creating: true
|
render json: service.column, status: :created, creating: true
|
||||||
|
@ -23,9 +20,9 @@ module RepositoryColumns
|
||||||
def update
|
def update
|
||||||
service = RepositoryColumns::UpdateColumnService
|
service = RepositoryColumns::UpdateColumnService
|
||||||
.call(user: current_user,
|
.call(user: current_user,
|
||||||
team: current_team,
|
team: current_team,
|
||||||
column: @repository_column,
|
column: @repository_column,
|
||||||
params: repository_column_params)
|
params: repository_column_params)
|
||||||
|
|
||||||
if service.succeed?
|
if service.succeed?
|
||||||
render json: service.column, status: :ok, editing: true
|
render json: service.column, status: :ok, editing: true
|
||||||
|
|
|
@ -2,9 +2,6 @@
|
||||||
|
|
||||||
module RepositoryColumns
|
module RepositoryColumns
|
||||||
class ListColumnsController < RepositoryColumnsController
|
class ListColumnsController < RepositoryColumnsController
|
||||||
before_action :load_column, only: %i(update items)
|
|
||||||
before_action :check_create_permissions, only: :create
|
|
||||||
before_action :check_manage_permissions, only: :update
|
|
||||||
helper_method :delimiters
|
helper_method :delimiters
|
||||||
|
|
||||||
def create
|
def create
|
||||||
|
@ -47,7 +44,7 @@ module RepositoryColumns
|
||||||
private
|
private
|
||||||
|
|
||||||
def search_params
|
def search_params
|
||||||
params.permit(:query, :column_id)
|
params.permit(:query, :repository_id, :id)
|
||||||
end
|
end
|
||||||
|
|
||||||
def repository_column_params
|
def repository_column_params
|
||||||
|
|
|
@ -3,9 +3,6 @@
|
||||||
module RepositoryColumns
|
module RepositoryColumns
|
||||||
class NumberColumnsController < RepositoryColumnsController
|
class NumberColumnsController < RepositoryColumnsController
|
||||||
include InputSanitizeHelper
|
include InputSanitizeHelper
|
||||||
before_action :load_column, only: :update
|
|
||||||
before_action :check_create_permissions, only: :create
|
|
||||||
before_action :check_manage_permissions, only: :update
|
|
||||||
|
|
||||||
def create
|
def create
|
||||||
service = RepositoryColumns::CreateColumnService
|
service = RepositoryColumns::CreateColumnService
|
||||||
|
|
|
@ -3,9 +3,6 @@
|
||||||
module RepositoryColumns
|
module RepositoryColumns
|
||||||
class StatusColumnsController < RepositoryColumnsController
|
class StatusColumnsController < RepositoryColumnsController
|
||||||
include InputSanitizeHelper
|
include InputSanitizeHelper
|
||||||
before_action :load_column, only: %i(update items)
|
|
||||||
before_action :check_create_permissions, only: :create
|
|
||||||
before_action :check_manage_permissions, only: :update
|
|
||||||
|
|
||||||
def create
|
def create
|
||||||
service = RepositoryColumns::CreateColumnService
|
service = RepositoryColumns::CreateColumnService
|
||||||
|
@ -47,7 +44,7 @@ module RepositoryColumns
|
||||||
private
|
private
|
||||||
|
|
||||||
def search_params
|
def search_params
|
||||||
params.permit(:query, :column_id)
|
params.permit(:query, :repository_id, :id)
|
||||||
end
|
end
|
||||||
|
|
||||||
def repository_column_params
|
def repository_column_params
|
||||||
|
|
|
@ -3,9 +3,6 @@
|
||||||
module RepositoryColumns
|
module RepositoryColumns
|
||||||
class TextColumnsController < RepositoryColumnsController
|
class TextColumnsController < RepositoryColumnsController
|
||||||
include InputSanitizeHelper
|
include InputSanitizeHelper
|
||||||
before_action :load_column, only: :update
|
|
||||||
before_action :check_create_permissions, only: :create
|
|
||||||
before_action :check_manage_permissions, only: :update
|
|
||||||
|
|
||||||
def create
|
def create
|
||||||
service = RepositoryColumns::CreateColumnService
|
service = RepositoryColumns::CreateColumnService
|
||||||
|
|
|
@ -3,9 +3,9 @@ class RepositoryColumnsController < ApplicationController
|
||||||
include RepositoryColumnsHelper
|
include RepositoryColumnsHelper
|
||||||
|
|
||||||
before_action :load_repository
|
before_action :load_repository
|
||||||
before_action :load_column, only: %i(edit destroy_html destroy)
|
before_action :load_column, only: %i(edit update destroy_html destroy items)
|
||||||
before_action :check_create_permissions, only: :new
|
before_action :check_create_permissions, only: %i(new create)
|
||||||
before_action :check_manage_permissions, only: %i(edit destroy_html destroy)
|
before_action :check_manage_permissions, only: %i(edit update destroy_html destroy)
|
||||||
before_action :load_asset_type_columns, only: :available_asset_type_columns
|
before_action :load_asset_type_columns, only: :available_asset_type_columns
|
||||||
|
|
||||||
def index
|
def index
|
||||||
|
@ -30,6 +30,10 @@ class RepositoryColumnsController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def create
|
||||||
|
raise NotImplementedError
|
||||||
|
end
|
||||||
|
|
||||||
def edit
|
def edit
|
||||||
render json: {
|
render json: {
|
||||||
html: render_to_string(
|
html: render_to_string(
|
||||||
|
@ -38,6 +42,10 @@ class RepositoryColumnsController < ApplicationController
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def update
|
||||||
|
raise NotImplementedError
|
||||||
|
end
|
||||||
|
|
||||||
def destroy_html
|
def destroy_html
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.json do
|
format.json do
|
||||||
|
@ -74,6 +82,8 @@ class RepositoryColumnsController < ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def items; end
|
||||||
|
|
||||||
def available_asset_type_columns
|
def available_asset_type_columns
|
||||||
if @asset_columns.empty?
|
if @asset_columns.empty?
|
||||||
render json: {
|
render json: {
|
||||||
|
|
Loading…
Add table
Reference in a new issue