From e764e856d8a6e5e46a9d3d87b34eb45b1c7260d9 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Tue, 10 Dec 2019 09:40:40 +0100 Subject: [PATCH 1/2] Fix syntax error --- app/models/repository_date_time_range_value_base.rb | 4 ++-- app/models/repository_date_time_value_base.rb | 4 ++-- app/models/repository_status_item.rb | 4 ++-- app/models/repository_status_value.rb | 4 ++-- app/models/user.rb | 12 ++++++------ spec/permissions/repositroy_permissions_spec.rb | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/models/repository_date_time_range_value_base.rb b/app/models/repository_date_time_range_value_base.rb index 83f6e7bc9..ec74d1cd8 100644 --- a/app/models/repository_date_time_range_value_base.rb +++ b/app/models/repository_date_time_range_value_base.rb @@ -4,9 +4,9 @@ class RepositoryDateTimeRangeValueBase < ApplicationRecord self.table_name = 'repository_date_time_range_values' belongs_to :created_by, foreign_key: :created_by_id, class_name: 'User', optional: true, - inverse_of: :created_repositroy_date_time_values + inverse_of: :created_repository_date_time_values belongs_to :last_modified_by, foreign_key: :last_modified_by_id, class_name: 'User', optional: true, - inverse_of: :modified_repositroy_date_time_values + inverse_of: :modified_repository_date_time_values has_one :repository_cell, as: :value, dependent: :destroy, inverse_of: :repository_date_time_value accepts_nested_attributes_for :repository_cell diff --git a/app/models/repository_date_time_value_base.rb b/app/models/repository_date_time_value_base.rb index 49ab0d1c2..1ca8184d3 100644 --- a/app/models/repository_date_time_value_base.rb +++ b/app/models/repository_date_time_value_base.rb @@ -4,9 +4,9 @@ class RepositoryDateTimeValueBase < ApplicationRecord self.table_name = 'repository_date_time_values' belongs_to :created_by, foreign_key: :created_by_id, class_name: 'User', optional: true, - inverse_of: :created_repositroy_date_time_values + inverse_of: :created_repository_date_time_values belongs_to :last_modified_by, foreign_key: :last_modified_by_id, class_name: 'User', optional: true, - inverse_of: :modified_repositroy_date_time_values + inverse_of: :modified_repository_date_time_values has_one :repository_cell, as: :value, dependent: :destroy, inverse_of: :repository_date_time_value accepts_nested_attributes_for :repository_cell diff --git a/app/models/repository_status_item.rb b/app/models/repository_status_item.rb index 735da93c5..8ab1de4f6 100644 --- a/app/models/repository_status_item.rb +++ b/app/models/repository_status_item.rb @@ -7,8 +7,8 @@ class RepositoryStatusItem < ApplicationRecord belongs_to :repository belongs_to :repository_column belongs_to :created_by, foreign_key: 'created_by_id', class_name: 'User', optional: true, - inverse_of: :created_repositroy_status_types + inverse_of: :created_repository_status_types belongs_to :last_modified_by, foreign_key: 'last_modified_by_id', class_name: 'User', optional: true, - inverse_of: :modified_repositroy_status_types + inverse_of: :modified_repository_status_types has_many :repository_status_values, inverse_of: :repository_status_item, dependent: :delete_all end diff --git a/app/models/repository_status_value.rb b/app/models/repository_status_value.rb index 87a323ce5..5fde7afbd 100644 --- a/app/models/repository_status_value.rb +++ b/app/models/repository_status_value.rb @@ -3,9 +3,9 @@ class RepositoryStatusValue < ApplicationRecord belongs_to :repository_status_item belongs_to :created_by, foreign_key: 'created_by_id', class_name: 'User', optional: true, - inverse_of: :created_repositroy_status_value + inverse_of: :created_repository_status_value belongs_to :last_modified_by, foreign_key: 'last_modified_by_id', class_name: 'User', optional: true, - inverse_of: :modified_repositroy_status_value + inverse_of: :modified_repository_status_value has_one :repository_cell, as: :value, dependent: :destroy, inverse_of: :value accepts_nested_attributes_for :repository_cell diff --git a/app/models/user.rb b/app/models/user.rb index e11d35946..255aab8af 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -214,32 +214,32 @@ class User < ApplicationRecord has_many :assigned_my_module_repository_rows, class_name: 'MyModuleRepositoryRow', foreign_key: 'assigned_by_id' - has_many :created_repositroy_status_types, + has_many :created_repository_status_types, class_name: 'RepositoryStatusItem', foreign_key: 'created_by_id', inverse_of: :created_by, dependent: :nullify - has_many :modified_repositroy_status_types, + has_many :modified_repository_status_types, class_name: 'RepositoryStatusItem', foreign_key: 'last_modified_by_id', inverse_of: :last_modified_by, dependent: :nullify - has_many :created_repositroy_status_value, + has_many :created_repository_status_value, class_name: 'RepositoryStatusValue', foreign_key: 'created_by_id', inverse_of: :created_by, dependent: :nullify - has_many :modified_repositroy_status_value, + has_many :modified_repository_status_value, class_name: 'RepositoryStatusValue', foreign_key: 'last_modified_by_id', inverse_of: :last_modified_by, dependent: :nullify - has_many :created_repositroy_date_time_values, + has_many :created_repository_date_time_values, class_name: 'RepositoryDateTimeValue', foreign_key: 'created_by_id', inverse_of: :created_by, dependent: :nullify - has_many :modified_repositroy_date_time_values, + has_many :modified_repository_date_time_values, class_name: 'RepositoryDateTimeValue', foreign_key: 'last_modified_by_id', inverse_of: :last_modified_by, diff --git a/spec/permissions/repositroy_permissions_spec.rb b/spec/permissions/repositroy_permissions_spec.rb index 3fe0e3d37..6a65c103a 100644 --- a/spec/permissions/repositroy_permissions_spec.rb +++ b/spec/permissions/repositroy_permissions_spec.rb @@ -12,7 +12,7 @@ describe 'RepositoryPermissions' do let(:read_shared_repository) { create :repository, :read_shared } describe 'create_repository_rows, manage_repository_rows, create_repository_columns' do - context 'when team\'s repositroy' do + context 'when team\'s repository' do it 'should be true for admin' do create :user_team, :admin, user: user, team: team @@ -80,7 +80,7 @@ describe 'RepositoryPermissions' do end describe 'read_repository' do - context 'when team\'s repositroy' do + context 'when team\'s repository' do it 'should be true' do create :user_team, :normal_user, user: user, team: team From c6a3c41019cb651b5ccb49290e957b49a6a0e739 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Tue, 10 Dec 2019 10:13:41 +0100 Subject: [PATCH 2/2] Fix routes in dropdown --- .../_manage_column_modal_content.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/repository_columns/_manage_column_modal_content.html.erb b/app/views/repository_columns/_manage_column_modal_content.html.erb index edd19a240..8728ece74 100644 --- a/app/views/repository_columns/_manage_column_modal_content.html.erb +++ b/app/views/repository_columns/_manage_column_modal_content.html.erb @@ -58,23 +58,23 @@ <%= 'selected' if @repository_column.repository_status_value? %> > <%= t('libraries.manange_modal_column.select.repository_status_value') %> - +