From d79bacb5439484a9f7164c0c5b33a86ec6cdd170 Mon Sep 17 00:00:00 2001 From: Rodolfo Zitellini Date: Tue, 24 Aug 2021 07:41:36 +0200 Subject: [PATCH 1/3] Fix #1136, completely remove 511 --- config/marc/tag_config_source.yml | 7 ------- config/marc_index/index_config_source.yml | 1 - 2 files changed, 8 deletions(-) diff --git a/config/marc/tag_config_source.yml b/config/marc/tag_config_source.yml index 4d8789180..925daf9f4 100644 --- a/config/marc/tag_config_source.yml +++ b/config/marc/tag_config_source.yml @@ -339,13 +339,6 @@ - :occurrences: "?" - - c - :occurrences: "?" - "511": - :master: a - :indicator: "0#" - :occurrences: "*" - :fields: - - - a - - :occurrences: "?" "518": :master: a :indicator: "##" diff --git a/config/marc_index/index_config_source.yml b/config/marc_index/index_config_source.yml index 91d8c4a3a..81944eea5 100644 --- a/config/marc_index/index_config_source.yml +++ b/config/marc_index/index_config_source.yml @@ -110,7 +110,6 @@ fields: "508a": "510a": "510c": - "511a": "518a": :holding_record: true "520a": From 5e99211f1727dddeaa25c192b4869abb5e04ea85 Mon Sep 17 00:00:00 2001 From: Rodolfo Zitellini Date: Tue, 24 Aug 2021 08:35:38 +0200 Subject: [PATCH 2/3] Fix #1133, collections go only in composite volumes, also clean up the code a bit --- app/helpers/application_helper.rb | 4 +++- app/views/editor/_tag_header_buttons.html.erb | 12 +++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0a6fab54f..b250cc8f7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -111,8 +111,10 @@ def edit_user_registration_path def get_allowed_record_type(source) return nil if !source.is_a? Source - if source.record_type == MarcSource::RECORD_TYPES[:source] || source.record_type == MarcSource::RECORD_TYPES[:collection] + if source.record_type == MarcSource::RECORD_TYPES[:source] [MarcSource::RECORD_TYPES[:collection], MarcSource::RECORD_TYPES[:composite_volume]] + elsif source.record_type == MarcSource::RECORD_TYPES[:collection] + [MarcSource::RECORD_TYPES[:composite_volume]] elsif source.record_type == MarcSource::RECORD_TYPES[:edition_content] MarcSource::RECORD_TYPES[:edition] else diff --git a/app/views/editor/_tag_header_buttons.html.erb b/app/views/editor/_tag_header_buttons.html.erb index ab32bf559..ee3f29c5b 100644 --- a/app/views/editor/_tag_header_buttons.html.erb +++ b/app/views/editor/_tag_header_buttons.html.erb @@ -36,11 +36,13 @@
<%if new_window_controller && !empty_header %> - <% if selection_record_type != nil && selection_record_type.is_a?(Array) && selection_record_type.count > 1 %> - - - _ - _ + <% if selection_record_type != nil && selection_record_type.is_a?(Array) %> + <% if selection_record_type.include?(MarcSource::RECORD_TYPES[:collection])%> + _ + <% end %> + <% if selection_record_type.include?(MarcSource::RECORD_TYPES[:composite_volume])%> + _ + <% end %> <% else %> _ <% end %> From fdfaaf02d9de0d43bdac19b225524c3279e6f584 Mon Sep 17 00:00:00 2001 From: Rodolfo Zitellini Date: Tue, 24 Aug 2021 12:23:44 +0200 Subject: [PATCH 3/3] Fix #1118, add and remove tags --- .../configurations/HoldingBasicLabels.yml | 5 +++++ .../configurations/HoldingLayoutDefault.yml | 1 + .../configurations/HoldingLayoutShow.yml | 1 + .../configurations/SourceLayoutDefault.yml | 17 ++++++++++++++++- config/marc/tag_config_holding.yml | 7 +++++++ 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/config/editor_profiles/default/configurations/HoldingBasicLabels.yml b/config/editor_profiles/default/configurations/HoldingBasicLabels.yml index e31c442c3..0390f0227 100644 --- a/config/editor_profiles/default/configurations/HoldingBasicLabels.yml +++ b/config/editor_profiles/default/configurations/HoldingBasicLabels.yml @@ -45,6 +45,11 @@ a: label: records.performer_note label: records.note_on_performance +'525': + fields: + a: + label: records.supplementary_material + label: records.supplementary_material '541': fields: a: diff --git a/config/editor_profiles/default/configurations/HoldingLayoutDefault.yml b/config/editor_profiles/default/configurations/HoldingLayoutDefault.yml index 102ca3cb1..341d598f0 100644 --- a/config/editor_profiles/default/configurations/HoldingLayoutDefault.yml +++ b/config/editor_profiles/default/configurations/HoldingLayoutDefault.yml @@ -35,6 +35,7 @@ groups: edit_references: all_tags: - '500' + - '525' - '691' - '651' - '518' diff --git a/config/editor_profiles/default/configurations/HoldingLayoutShow.yml b/config/editor_profiles/default/configurations/HoldingLayoutShow.yml index c9dcca5bc..cccd6927e 100644 --- a/config/editor_profiles/default/configurations/HoldingLayoutShow.yml +++ b/config/editor_profiles/default/configurations/HoldingLayoutShow.yml @@ -37,6 +37,7 @@ groups: edit_references: all_tags: - '500' + - '525' - '691' - '651' - '518' diff --git a/config/editor_profiles/default/configurations/SourceLayoutDefault.yml b/config/editor_profiles/default/configurations/SourceLayoutDefault.yml index cc9921fd7..c3550578b 100644 --- a/config/editor_profiles/default/configurations/SourceLayoutDefault.yml +++ b/config/editor_profiles/default/configurations/SourceLayoutDefault.yml @@ -24,6 +24,7 @@ tag_exclude: - '595' - '651' - '657' + - '775' - '787' edition: - '506' @@ -56,6 +57,7 @@ tag_exclude: - '787' - '852' libretto_source: + - '026' - '588' - '590' - '594' @@ -67,7 +69,7 @@ tag_exclude: - '787' libretto_edition: - '506' - - '541' + - '525' - '541' - '561' - '563' @@ -77,17 +79,24 @@ tag_exclude: - '596' - '598' - '773' + - '775' - '787' - '852' libretto_edition_content: - '506' + - '525' - '541' - '561' + - '588' - '591' + - '594' + - '598' - '774' + - '775' - '787' - '852' theoretica_source: + - '026' - '588' - '590' - '594' @@ -97,9 +106,11 @@ tag_exclude: - '651' - '657' - '774' + - '775' - '787' theoretica_edition: - '506' + - '525' - '541' - '561' - '563' @@ -113,6 +124,7 @@ tag_exclude: - '657' - '772' - '773' + - '775' - '787' - '852' theoretica_edition_content: @@ -120,7 +132,10 @@ tag_exclude: - '541' - '561' - '591' + - '594' + - '598' - '774' + - '775' - '787' - '852' composite_volume: diff --git a/config/marc/tag_config_holding.yml b/config/marc/tag_config_holding.yml index cc32c9854..b34046fe1 100644 --- a/config/marc/tag_config_holding.yml +++ b/config/marc/tag_config_holding.yml @@ -74,6 +74,13 @@ :fields: - - a - :occurrences: "?" + "525": + :master: a + :indicator: "##" + :occurrences: "*" + :fields: + - - a + - :occurrences: "?" "541": :master: a :indicator: "1#"