scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #751 from okriuchykhin/ok_SCI_1519

Browse source 
Fix adding and editing repository items [SCI-1519]
This commit is contained in:
okriuchykhin 2017-07-26 11:25:43 +02:00 committed by GitHub
parent 38f254ae9b 6a43483a2f
commit 1f7528d4a4
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/controllers/repository_rows_controller.rb
View file

@ -19,9 +19,7 @@ class RepositoryRowsController < ApplicationController
record.transaction do
record.name = record_params[:name] unless record_params[:name].blank?
unless record.save
errors[:default_fields] = record.errors.messages
end
errors[:default_fields] = record.errors.messages unless record.save
if params[:repository_cells]
params[:repository_cells].each do |key, value|
column = @repository.repository_columns.detect do |c|
@ -94,9 +92,7 @@ class RepositoryRowsController < ApplicationController
@record.transaction do
@record.name = record_params[:name].blank? ? nil : record_params[:name]
unless @record.save
errors[:default_fields] = @record.errors.messages
end
errors[:default_fields] = @record.errors.messages unless @record.save
if params[:repository_cells]
params[:repository_cells].each do |key, value|
existing = @record.repository_cells.detect do |c|
@ -128,15 +124,12 @@ class RepositoryRowsController < ApplicationController
repository_column: column
}
)
cell = RepositoryCell.new(repository_row: @record,
repository_column: column,
value: cell_value)
cell_value.repository_cell = cell
if cell.save
record_annotation_notification(@record, cell)
if cell_value.save
record_annotation_notification(@record,
cell_value.repository_cell)
else
errors[:repository_cells] << {
"#{column.id}": cell.errors.messages
"#{column.id}": cell_value.errors.messages
}
end
end

1
app/models/repository_cell.rb
View file

@ -6,7 +6,6 @@ class RepositoryCell < ActiveRecord::Base
belongs_to :value, polymorphic: true, dependent: :destroy
validates :repository_column, presence: true
validates :value, presence: true
validate :repository_column_data_type
validates :repository_row,
uniqueness: { scope: :repository_column },