Skip to content
This repository was archived by the owner on Mar 24, 2020. It is now read-only.

Commit e3fb09d

Browse files
lsituVivianChu
authored andcommitted
References ucsdlib/damsmanager#388 - Revert codes for Create conditional
copyright boilerplate for RDCP.
1 parent bee2879 commit e3fb09d

File tree

3 files changed

+2
-73
lines changed

3 files changed

+2
-73
lines changed

app/views/shared/fields/_copyright.html.erb

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
end
1111

1212
fieldData = @document["#{prefix}copyright_tesim"]
13-
rights_holder = @document["#{prefix}rightsHolder_tesim"][0] if @document["#{prefix}rightsHolder_tesim"]
14-
unit_code = @document["#{prefix}unit_code_tesim"][0] if @document["#{prefix}unit_code_tesim"]
15-
copyright_txt = ''
1613

1714

1815
if fieldData != nil
@@ -28,18 +25,8 @@
2825
<p><strong><%= copyright['status'].gsub(/--/, ' – ') %></strong></p>
2926
<% end %>
3027
<p><%= copyright['purposeNote'] %></p>
31-
32-
<% if unit_code == "rdcp"
33-
if rights_holder && rights_holder == "UC Regents"
34-
copyright_txt = "UC San Diego"
35-
else
36-
copyright_txt = "the copyright holder(s)"
37-
end
38-
%>
39-
<p>This work is protected by U.S. Copyright Law (Title 17, U.S.C.), and made available under a Creative Commons (CC) license. Use of this work beyond that allowed by "fair use" or the CC license requires written permission of <%= copyright_txt %>. Responsibility for obtaining permissions and any use and distribution of this work rests exclusively with the user and not the UC San Diego Library. Inquiries can be made to the UC San Diego Library program having custody of the work.</p>
40-
<% else %>
41-
<p><%= copyright['note'] %></p>
42-
<% end %>
28+
29+
<p><%= copyright['note'] %></p>
4330
<%
4431

4532
concat htmlClose.html_safe

spec/features/dams_object_spec.rb

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1771,20 +1771,3 @@
17711771
expect(page).not_to have_text("Download file")
17721772
end
17731773
end
1774-
1775-
describe "RDCP copyrights" do
1776-
before(:all) do
1777-
@rdcpObj = DamsObject.create(pid: "xx21171200")
1778-
@rdcpObj.damsMetadata.content = File.new('spec/fixtures/damsObjectCopyrights.rdf.xml').read
1779-
@rdcpObj.save
1780-
solr_index @rdcpObj.pid
1781-
end
1782-
after(:all) do
1783-
@rdcpObj.delete
1784-
end
1785-
scenario 'should show boilerplate copyrights text' do
1786-
sign_in_developer
1787-
visit dams_object_path @rdcpObj.pid
1788-
expect(page).to have_content('the CC license requires written permission of UC San Diego.')
1789-
end
1790-
end

spec/fixtures/damsObjectCopyrights.rdf.xml

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)