From dc6cc3bc620c832bff138fd269d25d99179d003c Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Mon, 11 Nov 2019 09:04:36 +0100 Subject: [PATCH] Show after create flash messages --- app/assets/javascripts/repository_columns/index.js | 7 ++++++- .../repository_columns/asset_columns_controller.rb | 2 +- .../repository_columns/list_columns_controller.rb | 4 ++-- .../repository_columns/status_columns_controller.rb | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/repository_columns/index.js b/app/assets/javascripts/repository_columns/index.js index 801fce42a..52ead0ee7 100644 --- a/app/assets/javascripts/repository_columns/index.js +++ b/app/assets/javascripts/repository_columns/index.js @@ -46,7 +46,12 @@ var RepositoryColumns = (function() { RepositoryStatusValue: 'RepositoryStatusColumnType' }; var currentPartial = $('#repository-column-data-type').find(':selected').val(); - return eval(validators[currentPartial]).checkValidation(); + + if (validators[currentPartial]) { + return eval(validators[currentPartial]) + .checkValidation(); + } + return true; } diff --git a/app/controllers/repository_columns/asset_columns_controller.rb b/app/controllers/repository_columns/asset_columns_controller.rb index f0c691e73..4ba05f781 100644 --- a/app/controllers/repository_columns/asset_columns_controller.rb +++ b/app/controllers/repository_columns/asset_columns_controller.rb @@ -28,7 +28,7 @@ module RepositoryColumns params: repository_column_params) if service.succeed? - render json: service.column, status: :ok, updating: true + render json: service.column, status: :ok, editing: true else render json: service.errors, status: :unprocessable_entity end diff --git a/app/controllers/repository_columns/list_columns_controller.rb b/app/controllers/repository_columns/list_columns_controller.rb index 998d7f5e6..018c0473c 100644 --- a/app/controllers/repository_columns/list_columns_controller.rb +++ b/app/controllers/repository_columns/list_columns_controller.rb @@ -14,7 +14,7 @@ module RepositoryColumns params: repository_column_params) if service.succeed? - render json: service.column, status: :created + render json: service.column, status: :created, creating: true else render json: service.errors, status: :unprocessable_entity end @@ -28,7 +28,7 @@ module RepositoryColumns params: repository_column_params) if service.succeed? - render json: service.column, status: :ok + render json: service.column, status: :ok, editing: true else render json: service.errors, status: :unprocessable_entity end diff --git a/app/controllers/repository_columns/status_columns_controller.rb b/app/controllers/repository_columns/status_columns_controller.rb index dfc7a7e05..6dbd30d6e 100644 --- a/app/controllers/repository_columns/status_columns_controller.rb +++ b/app/controllers/repository_columns/status_columns_controller.rb @@ -14,7 +14,7 @@ module RepositoryColumns params: repository_column_params) if service.succeed? - render json: service.column, status: :created + render json: service.column, status: :created, creating: true else render json: service.errors, status: :unprocessable_entity end @@ -28,7 +28,7 @@ module RepositoryColumns params: update_repository_column_params) if service.succeed? - render json: service.column, status: :ok + render json: service.column, status: :ok, editing: true else render json: service.errors, status: :unprocessable_entity end