scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-07 05:03:26 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2256 from urbanrotnik/ur-sci-fix-syntax-errors

Browse source 
Fix syntax errors
This commit is contained in:
Urban Rotnik 2019-12-10 10:50:06 +01:00 committed by GitHub
commit 28986ee177
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/repository_date_time_range_value_base.rb
View file

@ -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

4
app/models/repository_date_time_value_base.rb
View file

@ -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

4
app/models/repository_status_item.rb
View file

@ -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

4
app/models/repository_status_value.rb
View file

@ -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

12
app/models/user.rb
View file

@ -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,

8
app/views/repository_columns/_manage_column_modal_content.html.erb
View file

@ -58,23 +58,23 @@
<%= 'selected' if @repository_column.repository_status_value? %> >
<%= t('libraries.manange_modal_column.select.repository_status_value') %>
</option>
<option data-delimiter=true></option>
<option data-create-url="<%= repository_repository_columns_date_time_columns_path(@repository) %>"
data-edit-url="<%= repository_repository_columns_asset_column_path(@repository, @repository_column) unless @repository_column.new_record? %>"
data-edit-url="<%= repository_repository_columns_date_time_column_path(@repository, @repository_column) unless @repository_column.new_record? %>"
value="RepositoryDateValue"
<%= 'selected' if @repository_column.repository_date_value? || @repository_column.repository_date_range_value? %> >
<%= t('libraries.manange_modal_column.select.repository_date_value') %>
<option data-create-url="<%= repository_repository_columns_date_time_columns_path(@repository) %>"
data-edit-url="<%= repository_repository_columns_asset_column_path(@repository, @repository_column) unless @repository_column.new_record? %>"
data-edit-url="<%= repository_repository_columns_date_time_column_path(@repository, @repository_column) unless @repository_column.new_record? %>"
value="RepositoryTimeValue"
<%= 'selected' if @repository_column.repository_time_value? || @repository_column.repository_time_range_value? %> >
<%= t('libraries.manange_modal_column.select.repository_time_value') %>
<option data-create-url="<%= repository_repository_columns_date_time_columns_path(@repository) %>"
data-edit-url="<%= repository_repository_columns_asset_column_path(@repository, @repository_column) unless @repository_column.new_record? %>"
data-edit-url="<%= repository_repository_columns_date_time_column_path(@repository, @repository_column) unless @repository_column.new_record? %>"
value="RepositoryDateTimeValue"
<%= 'selected' if @repository_column.repository_date_time_value? || @repository_column.repository_date_time_range_value? %> >
<%= t('libraries.manange_modal_column.select.repository_date_time_value') %>

4
spec/permissions/repositroy_permissions_spec.rb
View file

@ -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