Merge pull request #537 from RockefellerArchiveCenter/rights

Improve display of rights statements
RockefellerArchiveCenter · Jun 27, 2022 · 4cc9724 · 4cc9724
2 parents 8bf349f + 95ff2df
commit 4cc9724
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/bag_transfer/templates/parts/rights_table.html b/bag_transfer/templates/parts/rights_table.html
@@ -11,7 +11,7 @@
     <tbody>
       {% for statement in org.rights_statements %}
       <tr rel="{{ statement.pk }}">
-        <td>{% for t in statement.applies_to_type.all %}{{t.name}}{% if not forloop.last %}<br />{%endif%}{% endfor %}</td>
+        <td><ul>{% for t in statement.applies_to_type.all %}<li>{{t.name}}</li>{% endfor %}</ul></td>
         <td>{{statement.rights_basis}}</td>
         <td>{{statement.rights_info_notes}}</td>
         <td class="text-right col-md-4">

diff --git a/bag_transfer/templates/transfers/detail.html b/bag_transfer/templates/transfers/detail.html
@@ -64,6 +64,21 @@ <h2 class="box-title">Error Messages</h2>
 </div>
 {% endif %}
 
+{% if object.rights_statements.all %}
+<div class="row">
+	<div class="col-md-12">
+		<div class="box box-primary">
+			<div class="box-header with-border">
+				<h2 class="box-title">Rights Statements</h2>
+			</div>
+			<div class="box-body no-padding">
+				{% include 'parts/transfer_rights_table.html' with rights_statements=object.rights_statements.all %}
+			</div>
+		</div>
+	</div>
+</div>
+{% endif %}
+
 <div class="row">
 	<div class="col-md-12">
 		<div class="box box-primary">
@@ -92,21 +107,6 @@ <h2 class="box-title">Log</h2>
 	</div>
 </div>
 
-{% if object.rights_statements.all %}
-<div class="row">
-	<div class="col-md-12">
-		<div class="box box-primary">
-			<div class="box-header with-border">
-				<h2 class="box-title">Rights Statements</h2>
-			</div>
-			<div class="box-body no-padding">
-				{% include 'parts/transfer_rights_table.html' with rights_statements=object.rights_statements.all %}
-			</div>
-		</div>
-	</div>
-</div>
-{% endif %}
-
 {% if object.archivesspace_identifier or object.archivesspace_parent_identifier %}
 <div class="row">
 	<div class="col-md-12">

diff --git a/scripts/import_sample_data b/scripts/import_sample_data
@@ -3,6 +3,6 @@
 # Script to import set of sample bags
 # Copies files to data upload directory and then runs cron
 
-cp -r ../sample_bags/* /data/donororganization/upload/
+cp -r sample_bags/* /data/donororganization/upload/
 chown -R donor /data/donororganization/upload/
 python manage.py runcrons bag_transfer.lib.cron.DiscoverTransfers