From 2248bf46642dd2afb3ee6f7110e2598d251b58ec Mon Sep 17 00:00:00 2001 From: criedlberger Date: Fri, 12 Jun 2015 15:32:35 -0600 Subject: [PATCH 1/5] Added full text for rights --- app/assets/javascripts/custom.js | 29 ++++++++++++++----- app/forms/hydranorth/forms/cstr_edit_form.rb | 2 +- .../forms/generic_file_edit_form.rb | 2 +- app/forms/hydranorth/forms/ser_edit_form.rb | 2 +- .../hydranorth/generic_file/export.rb | 4 ++- .../hydranorth/generic_file/metadata.rb | 3 ++ app/presenters/hydranorth/cstr_presenter.rb | 2 +- .../hydranorth/generic_file_presenter.rb | 2 +- app/presenters/hydranorth/ser_presenter.rb | 2 +- app/views/batch/_metadata.html.erb | 4 ++- app/views/batch/_more_metadata.html.erb | 2 +- .../records/edit_fields/_license.html.erb | 4 +-- .../records/edit_fields/_rights.html.erb | 1 + 13 files changed, 40 insertions(+), 19 deletions(-) mode change 100644 => 100755 app/assets/javascripts/custom.js mode change 100644 => 100755 app/forms/hydranorth/forms/cstr_edit_form.rb mode change 100644 => 100755 app/forms/hydranorth/forms/ser_edit_form.rb mode change 100644 => 100755 app/models/concerns/hydranorth/generic_file/export.rb mode change 100644 => 100755 app/models/concerns/hydranorth/generic_file/metadata.rb mode change 100644 => 100755 app/presenters/hydranorth/cstr_presenter.rb mode change 100644 => 100755 app/presenters/hydranorth/generic_file_presenter.rb mode change 100644 => 100755 app/presenters/hydranorth/ser_presenter.rb mode change 100644 => 100755 app/views/batch/_more_metadata.html.erb mode change 100644 => 100755 app/views/records/edit_fields/_license.html.erb create mode 100755 app/views/records/edit_fields/_rights.html.erb diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js old mode 100644 new mode 100755 index 08d559af..4c85c470 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -27,15 +27,28 @@ $(document).ready(function(){ var randomSlide2 = images2[Math.floor(Math.random() * images.length)]; $('#slide2').addClass(randomSlide2); - if ($("#tweets").length){ - var config1 = { - "id": '586195044660424704', - "domId": 'tweets', - "maxTweets": 2, - "enableLinks": true - }; - twitterFetcher.fetch(config1); + if ($("#generic_file_license").length){ + $("#generic_file_rights").hide() + $("#generic_file_license").change(function() { + if ($("#generic_file_license").val()=="I am required to use/link to a publisher's license") { + $("#generic_file_rights").show(); + $("#generic_file_license").val(""); + } + else { + $("#generic_file_rights").hide(); + $("#generic_file_rights").val(""); + } + }); } + if ($("#tweets").length){ + var config1 = { + "id": '586195044660424704', + "domId": 'tweets', + "maxTweets": 2, + "enableLinks": true + }; + twitterFetcher.fetch(config1); + } if ($("#chartContainer").length){ var chart = new CanvasJS.Chart("chartContainer", { diff --git a/app/forms/hydranorth/forms/cstr_edit_form.rb b/app/forms/hydranorth/forms/cstr_edit_form.rb old mode 100644 new mode 100755 index 5c05580e..e7c79b21 --- a/app/forms/hydranorth/forms/cstr_edit_form.rb +++ b/app/forms/hydranorth/forms/cstr_edit_form.rb @@ -2,7 +2,7 @@ module Hydranorth module Forms class CstrEditForm < CstrPresenter include HydraEditor::Form - self.required_fields = [:title, :creator, :subject, :license, :trid, :language] + self.required_fields = [:title, :creator, :subject, :trid, :language] # This is required so that fields_for will draw a nested form. # See ActionView::Helpers#nested_attributes_association? diff --git a/app/forms/hydranorth/forms/generic_file_edit_form.rb b/app/forms/hydranorth/forms/generic_file_edit_form.rb index ed1e5895..ecf5f071 100755 --- a/app/forms/hydranorth/forms/generic_file_edit_form.rb +++ b/app/forms/hydranorth/forms/generic_file_edit_form.rb @@ -4,7 +4,7 @@ module Forms class GenericFileEditForm < GenericFilePresenter include HydraEditor::Form include HydraEditor::Form::Permissions - self.required_fields = [:title, :resource_type, :language, :creator, :subject, :license ] + self.required_fields = [:title, :resource_type, :language, :creator, :subject ] # This is required so that fields_for will draw a nested form. # See ActionView::Helpers#nested_attributes_association? diff --git a/app/forms/hydranorth/forms/ser_edit_form.rb b/app/forms/hydranorth/forms/ser_edit_form.rb old mode 100644 new mode 100755 index ccd0f759..3954f7c2 --- a/app/forms/hydranorth/forms/ser_edit_form.rb +++ b/app/forms/hydranorth/forms/ser_edit_form.rb @@ -2,7 +2,7 @@ module Hydranorth module Forms class SerEditForm < SerPresenter include HydraEditor::Form - self.required_fields = [:title, :creator, :subject, :license, :ser, :language] + self.required_fields = [:title, :creator, :subject, :ser, :language] # This is required so that fields_for will draw a nested form. # See ActionView::Helpers#nested_attributes_association? diff --git a/app/models/concerns/hydranorth/generic_file/export.rb b/app/models/concerns/hydranorth/generic_file/export.rb old mode 100644 new mode 100755 index 1af6c8aa..2156693f --- a/app/models/concerns/hydranorth/generic_file/export.rb +++ b/app/models/concerns/hydranorth/generic_file/export.rb @@ -15,7 +15,8 @@ def export_as_openurl_ctx_kev date_created: 'date', resource_type: 'format', language: 'language', - license: 'license' + license: 'license' , + rights: 'rights' } Rails.logger.debug "field_map #{field_map}" field_map.each do |element, kev| @@ -28,6 +29,7 @@ def export_as_openurl_ctx_kev Rails.logger.debug "self.resource_type #{self.resource_type}" Rails.logger.debug "self.language #{self.language}" Rails.logger.debug "self.license #{self.license}" + Rails.logger.debug "self.rights #{self.rights}" Rails.logger.debug "self.contributor #{self.contributor.inspect}" values = self.send(element) Rails.logger.debug "values #{values}" diff --git a/app/models/concerns/hydranorth/generic_file/metadata.rb b/app/models/concerns/hydranorth/generic_file/metadata.rb old mode 100644 new mode 100755 index 49cc7525..cbb29c84 --- a/app/models/concerns/hydranorth/generic_file/metadata.rb +++ b/app/models/concerns/hydranorth/generic_file/metadata.rb @@ -9,6 +9,9 @@ module Metadata property :license, predicate: ::RDF::DC.license, multiple: false do |index| index.as :stored_searchable end + property :rights, predicate: ::RDF::DC.rights, multiple: false do |index| + index.as :stored_searchable + end property :trid, predicate: ::UALTerms.trid, multiple: false do |index| index.as :stored_searchable, :sortable end diff --git a/app/presenters/hydranorth/cstr_presenter.rb b/app/presenters/hydranorth/cstr_presenter.rb old mode 100644 new mode 100755 index 39879758..bef5955d --- a/app/presenters/hydranorth/cstr_presenter.rb +++ b/app/presenters/hydranorth/cstr_presenter.rb @@ -3,7 +3,7 @@ class CstrPresenter < GenericFilePresenter include Hydra::Presenter self.model_class = ::GenericFile # Terms is the list of fields displayed by app/views/generic_files/_show_descriptions.html.erb - self.terms = [:title, :creator, :contributor, :subject, :resource_type, :trid, :language, :spatial, :temporal, :description, :date_created, :license, :is_version_of, :source, :related_url] + self.terms = [:title, :creator, :contributor, :subject, :resource_type, :trid, :language, :spatial, :temporal, :description, :date_created, :license, :rights, :is_version_of, :source, :related_url] end end diff --git a/app/presenters/hydranorth/generic_file_presenter.rb b/app/presenters/hydranorth/generic_file_presenter.rb old mode 100644 new mode 100755 index 37ea561b..2af8fce0 --- a/app/presenters/hydranorth/generic_file_presenter.rb +++ b/app/presenters/hydranorth/generic_file_presenter.rb @@ -3,7 +3,7 @@ class GenericFilePresenter include Hydra::Presenter self.model_class = ::GenericFile # Terms is the list of fields displayed by app/views/generic_files/_show_descriptions.html.erb - self.terms = [:title, :creator, :contributor, :subject, :resource_type, :language, :spatial, :temporal, :description, :date_created, :license, :is_version_of, :source, :related_url] + self.terms = [:title, :creator, :contributor, :subject, :resource_type, :language, :spatial, :temporal, :description, :date_created, :license, :rights, :is_version_of, :source, :related_url] # Depositor and permissions are not displayed in app/views/generic_files/_show_descriptions.html.erb # so don't include them in `terms'. diff --git a/app/presenters/hydranorth/ser_presenter.rb b/app/presenters/hydranorth/ser_presenter.rb old mode 100644 new mode 100755 index 7087b85c..39136f4c --- a/app/presenters/hydranorth/ser_presenter.rb +++ b/app/presenters/hydranorth/ser_presenter.rb @@ -3,7 +3,7 @@ class SerPresenter < GenericFilePresenter include Hydra::Presenter self.model_class = ::GenericFile # Terms is the list of fields displayed by app/views/generic_files/_show_descriptions.html.erb - self.terms = [:title, :creator, :contributor, :subject, :resource_type, :ser, :language, :spatial, :temporal, :description, :date_created, :license, :is_version_of, :source, :related_url] + self.terms = [:title, :creator, :contributor, :subject, :resource_type, :ser, :language, :spatial, :temporal, :description, :date_created, :license, :rights, :is_version_of, :source, :related_url] end end diff --git a/app/views/batch/_metadata.html.erb b/app/views/batch/_metadata.html.erb index a778ce09..58e251eb 100755 --- a/app/views/batch/_metadata.html.erb +++ b/app/views/batch/_metadata.html.erb @@ -49,7 +49,9 @@ <%= f.input :creator, as: :multi_value_with_help, input_html: { required: true } %> <%= f.input :subject, as: :multi_value_with_help, input_html: {required: true} %> <%= f.input :license, as: :select_with_modal_help, collection: Sufia.config.cc_licenses, - input_html: { class: 'form-control', required: true }, include_blank: true %> + input_html: { class: 'form-control', required: false }, include_blank: true %> + + <%= f.input :rights, label: false, required: false, input_html: { value: 'Enter license info here', type: 'textarea' } %> <%= render "generic_files/license_modal" %> diff --git a/app/views/batch/_more_metadata.html.erb b/app/views/batch/_more_metadata.html.erb old mode 100644 new mode 100755 index b32265fc..decd295b --- a/app/views/batch/_more_metadata.html.erb +++ b/app/views/batch/_more_metadata.html.erb @@ -1,6 +1,6 @@
- <% (f.object.terms - [:title, :trid, :ser, :creator, :license, :resource_type, :language, :subject]).each do |term| %> + <% (f.object.terms - [:title, :trid, :ser, :creator, :license, :rights, :resource_type, :language, :subject]).each do |term| %> <%# <%= f.input term, as: :multi_value_with_help, input_html: { required: false} %> <%= render_edit_field_partial(term, f: f) %> <% end %> diff --git a/app/views/records/edit_fields/_license.html.erb b/app/views/records/edit_fields/_license.html.erb old mode 100644 new mode 100755 index 99769f26..dd3ba399 --- a/app/views/records/edit_fields/_license.html.erb +++ b/app/views/records/edit_fields/_license.html.erb @@ -1,9 +1,9 @@ <% if @generic_file.nil? || @generic_file.license.blank? || Sufia.config.cc_licenses_reverse.has_key?(@generic_file.license) %> <%= f.input :license, as: :select_with_modal_help, collection: Sufia.config.cc_licenses, - input_html: { class: 'form-control', required: true }, include_blank: true %> + input_html: { class: 'form-control' }, include_blank: true %> <% else %> <%= f.input :license, as: :select_with_modal_help, collection: Sufia.config.cc_licenses.dup.merge({@generic_file.license => @generic_file.license}), - input_html: { class: 'form-control', required: true }, include_blank: true %> + input_html: { class: 'form-control' }, include_blank: true %> <% end %> <%= render "collections/license_modal" %> diff --git a/app/views/records/edit_fields/_rights.html.erb b/app/views/records/edit_fields/_rights.html.erb new file mode 100755 index 00000000..66ec5934 --- /dev/null +++ b/app/views/records/edit_fields/_rights.html.erb @@ -0,0 +1 @@ +<%= f.input :rights, label: false, required: false, input_html: { value: 'Enter license info here', type: 'textarea' } %> From 2beb00738c2a87f43188c9fac2627548df1fb275 Mon Sep 17 00:00:00 2001 From: criedlberger Date: Thu, 18 Jun 2015 11:49:51 -0600 Subject: [PATCH 2/5] Add tests --- app/assets/javascripts/custom.js | 29 +++++++++- app/views/batch/_metadata.html.erb | 2 +- .../records/edit_fields/_rights.html.erb | 2 +- .../records/show_fields/_rights.html.erb | 2 +- spec/features/edit_rights_spec.rb | 53 +++++++++++++++++++ spec/forms/generic_file_edit_form_spec.rb | 2 +- spec/presenters/hydranorth/cstr_presenter.rb | 2 +- spec/presenters/hydranorth/ser_presenter.rb | 2 +- 8 files changed, 86 insertions(+), 8 deletions(-) mode change 100644 => 100755 app/views/records/show_fields/_rights.html.erb create mode 100755 spec/features/edit_rights_spec.rb mode change 100644 => 100755 spec/forms/generic_file_edit_form_spec.rb mode change 100644 => 100755 spec/presenters/hydranorth/cstr_presenter.rb mode change 100644 => 100755 spec/presenters/hydranorth/ser_presenter.rb diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index 4c85c470..14789fd1 100755 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -28,18 +28,43 @@ $(document).ready(function(){ $('#slide2').addClass(randomSlide2); if ($("#generic_file_license").length){ - $("#generic_file_rights").hide() + debugger; $("#generic_file_license").change(function() { if ($("#generic_file_license").val()=="I am required to use/link to a publisher's license") { + $("#generic_file_rights").val("Enter full text rights"); + $('label[for="generic_file_rights"]').show(); $("#generic_file_rights").show(); - $("#generic_file_license").val(""); + $("#generic_file_license").val(""); + $("#generic_file_rights").focus(); } else { + $('label[for="generic_file_rights"]').hide(); $("#generic_file_rights").hide(); $("#generic_file_rights").val(""); } + }); } + if ($("#generic_file_rights").length){ + debugger; + if (document.getElementById('generic_file_rights') == null) { + $('label[for="generic_file_rights"]').hide(); + $("#generic_file_rights").hide(); + } + else { + if (document.getElementById('generic_file_rights').value == "") { + $('label[for="generic_file_rights"]').hide(); + $("#generic_file_rights").hide(); + } + else { + $('label[for="generic_file_rights"]').show(); + $("#generic_file_rights").show(); + } + } + } + if ($("#upload_submit").length){ + debugger; + } if ($("#tweets").length){ var config1 = { "id": '586195044660424704', diff --git a/app/views/batch/_metadata.html.erb b/app/views/batch/_metadata.html.erb index 58e251eb..cd6fd8e4 100755 --- a/app/views/batch/_metadata.html.erb +++ b/app/views/batch/_metadata.html.erb @@ -51,7 +51,7 @@ <%= f.input :license, as: :select_with_modal_help, collection: Sufia.config.cc_licenses, input_html: { class: 'form-control', required: false }, include_blank: true %> - <%= f.input :rights, label: false, required: false, input_html: { value: 'Enter license info here', type: 'textarea' } %> + <%= f.input :rights, required: false, input_html: { type: 'textarea' } %> <%= render "generic_files/license_modal" %> diff --git a/app/views/records/edit_fields/_rights.html.erb b/app/views/records/edit_fields/_rights.html.erb index 66ec5934..49e4fbda 100755 --- a/app/views/records/edit_fields/_rights.html.erb +++ b/app/views/records/edit_fields/_rights.html.erb @@ -1 +1 @@ -<%= f.input :rights, label: false, required: false, input_html: { value: 'Enter license info here', type: 'textarea' } %> +<%= f.input :rights, required: false, input_html: { type: 'textarea' } %> diff --git a/app/views/records/show_fields/_rights.html.erb b/app/views/records/show_fields/_rights.html.erb old mode 100644 new mode 100755 index 182c84fe..38ba7b47 --- a/app/views/records/show_fields/_rights.html.erb +++ b/app/views/records/show_fields/_rights.html.erb @@ -1 +1 @@ - <%=link_to_field('rights',record.rights, Sufia.config.cc_licenses_reverse[record.rights])%> <%= iconify_auto_link(record.rights,false) %>
+ <%=link_to_field('rights',record.rights, Sufia.config.cc_licenses_reverse[record.rights])%>
diff --git a/spec/features/edit_rights_spec.rb b/spec/features/edit_rights_spec.rb new file mode 100755 index 00000000..c14942a3 --- /dev/null +++ b/spec/features/edit_rights_spec.rb @@ -0,0 +1,53 @@ +require 'spec_helper' + +describe 'Rights', :type => :feature do + + let(:admin) { FactoryGirl.create :admin } + let!(:file) do + GenericFile.new.tap do |f| + f.title = ['non_standard_file.txt'] + f.creator = ['non_standard_creator'] + f.license = "Attribution 4.0 International" + f.read_groups = ['public'] + f.apply_depositor_metadata(admin.user_key) + f.save! + end + end + + after :all do + cleanup_jetty + end + + describe 'check if rights does not exist' do + + before do + sign_in admin + visit "/dashboard/files" + within("#document_#{file.id}") do + click_button "Select an action" + click_link "Edit File" + end + end + + it { expect(page).to have_select('generic_file_license', with_options: ['Attribution 4.0 International']) } + it { expect(page).to_not have_field('generic_file_rights') } + end + + describe 'check if rights does exist' do + + before do + sign_in admin + visit "/dashboard/files" + within("#document_#{file.id}") do + click_button "Select an action" + click_link "Edit File" + end + select("I am required to use/link to a publisher's license", from: "generic_file[license]") + fill_in 'generic_file_rights', :with => 'Rights' + click_button "Update Generic file" + end + + it { expect(page).to have_field('generic_file_rights', with: 'Rights') } + end + +end diff --git a/spec/forms/generic_file_edit_form_spec.rb b/spec/forms/generic_file_edit_form_spec.rb old mode 100644 new mode 100755 index dc23d3d5..89f47d9b --- a/spec/forms/generic_file_edit_form_spec.rb +++ b/spec/forms/generic_file_edit_form_spec.rb @@ -5,7 +5,7 @@ describe "#terms" do it "should return a list" do - expect(subject.terms).to eq([:title, :creator, :contributor, :subject, :resource_type, :language, :spatial, :temporal, :description, :date_created, :license, :is_version_of, :source, :related_url ]) + expect(subject.terms).to eq([:title, :creator, :contributor, :subject, :resource_type, :language, :spatial, :temporal, :description, :date_created, :license, :rights, :is_version_of, :source, :related_url ]) end end diff --git a/spec/presenters/hydranorth/cstr_presenter.rb b/spec/presenters/hydranorth/cstr_presenter.rb old mode 100644 new mode 100755 index de3f7463..ad0b67e5 --- a/spec/presenters/hydranorth/cstr_presenter.rb +++ b/spec/presenters/hydranorth/cstr_presenter.rb @@ -3,7 +3,7 @@ describe Hydranorth::CstrPresenter do describe ".terms" do it "should return a list" do - expect(described_class.terms).to eq([:resource_type, :title, :trid, :creator, :contributor, :description, :date_created, :license, :subject, :spatial, :temporal, :is_version_of, :source, :related_url, :language]) + expect(described_class.terms).to eq([:resource_type, :title, :trid, :creator, :contributor, :description, :date_created, :license, :rights, :subject, :spatial, :temporal, :is_version_of, :source, :related_url, :language]) end end end diff --git a/spec/presenters/hydranorth/ser_presenter.rb b/spec/presenters/hydranorth/ser_presenter.rb old mode 100644 new mode 100755 index ba7c0b10..d6a34a4e --- a/spec/presenters/hydranorth/ser_presenter.rb +++ b/spec/presenters/hydranorth/ser_presenter.rb @@ -3,7 +3,7 @@ describe Hydranorth::SerPresenter do describe ".terms" do it "should return a list" do - expect(described_class.terms).to eq([:resource_type, :title, :ser, :creator, :contributor, :description, :date_created, :license, :subject, :spatial, :temporal, :is_version_of, :source, :related_url, :language]) + expect(described_class.terms).to eq([:resource_type, :title, :ser, :creator, :contributor, :description, :date_created, :license, :rights, :subject, :spatial, :temporal, :is_version_of, :source, :related_url, :language]) end end end From 6acc2b194428308d4368b53de2eb0a85f7d27d01 Mon Sep 17 00:00:00 2001 From: criedlberger Date: Thu, 18 Jun 2015 12:15:06 -0600 Subject: [PATCH 3/5] modified custom.js --- app/assets/javascripts/custom.js | 5 ----- config/initializers/sufia.rb | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index 14789fd1..917e6d44 100755 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -28,7 +28,6 @@ $(document).ready(function(){ $('#slide2').addClass(randomSlide2); if ($("#generic_file_license").length){ - debugger; $("#generic_file_license").change(function() { if ($("#generic_file_license").val()=="I am required to use/link to a publisher's license") { $("#generic_file_rights").val("Enter full text rights"); @@ -46,7 +45,6 @@ $(document).ready(function(){ }); } if ($("#generic_file_rights").length){ - debugger; if (document.getElementById('generic_file_rights') == null) { $('label[for="generic_file_rights"]').hide(); $("#generic_file_rights").hide(); @@ -62,9 +60,6 @@ $(document).ready(function(){ } } } - if ($("#upload_submit").length){ - debugger; - } if ($("#tweets").length){ var config1 = { "id": '586195044660424704', diff --git a/config/initializers/sufia.rb b/config/initializers/sufia.rb index 7bb39f54..67812d41 100755 --- a/config/initializers/sufia.rb +++ b/config/initializers/sufia.rb @@ -19,6 +19,7 @@ 'Attribution-NonCommercial-ShareAlike 4.0 International' => 'http://creativecommons.org/licenses/by-nc-sa/4.0/', 'Public Domain Mark 1.0' => 'http://creativecommons.org/publicdomain/mark/1.0/', 'CC0 1.0 Universal' => 'http://creativecommons.org/publicdomain/zero/1.0/', + "I am required to use/link to a publisher's license" => "I am required to use/link to a publisher's license", } config.cc_licenses_reverse = Hash[*config.cc_licenses.to_a.flatten.reverse] @@ -88,9 +89,19 @@ # please run rake db:seed to create the collections and restart httpd. # The collection IDs will be added here # In production it assumes that the collections will be available in the system at the time of deposit - # config.cstr_collection_id = "" - # config.ser_collection_id = "" + + + + + + + + + + + config.cstr_collection_id = "4m90dw65k" + config.ser_collection_id = "4m90dw66v" config.special_reports = { "cstr" => "Computing Science Technical Report", "ser" => "Structural Engineering Report", @@ -143,6 +154,7 @@ # Specify the path to the file characterization tool: # config.fits_path = "fits.sh" + config.fits_path = "fits" config.fits_path = "fits" config.enable_contact_form_delivery = true From 6d7cf54159f99386c98940619390b55ba7a2401c Mon Sep 17 00:00:00 2001 From: root Date: Thu, 18 Jun 2015 16:07:08 -0600 Subject: [PATCH 4/5] Changed edit rights view --- app/views/records/show_fields/_rights.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/records/show_fields/_rights.html.erb b/app/views/records/show_fields/_rights.html.erb index 38ba7b47..e367e692 100755 --- a/app/views/records/show_fields/_rights.html.erb +++ b/app/views/records/show_fields/_rights.html.erb @@ -1 +1 @@ - <%=link_to_field('rights',record.rights, Sufia.config.cc_licenses_reverse[record.rights])%>
+<%= record.rights %>
From d606bc7797db92267feac071e33f07969d309052 Mon Sep 17 00:00:00 2001 From: Peter Binkley Date: Tue, 23 Jun 2015 16:21:23 -0600 Subject: [PATCH 5/5] Restored default values in sufia.rb --- config/initializers/sufia.rb | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/config/initializers/sufia.rb b/config/initializers/sufia.rb index 67812d41..2a639a16 100755 --- a/config/initializers/sufia.rb +++ b/config/initializers/sufia.rb @@ -89,19 +89,8 @@ # please run rake db:seed to create the collections and restart httpd. # The collection IDs will be added here # In production it assumes that the collections will be available in the system at the time of deposit - - - - - - - - - - - - config.cstr_collection_id = "4m90dw65k" - config.ser_collection_id = "4m90dw66v" + # config.cstr_collection_id = "" + # config.ser_collection_id = "" config.special_reports = { "cstr" => "Computing Science Technical Report", "ser" => "Structural Engineering Report", @@ -154,7 +143,6 @@ # Specify the path to the file characterization tool: # config.fits_path = "fits.sh" - config.fits_path = "fits" config.fits_path = "fits" config.enable_contact_form_delivery = true