Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve display of rights statements #537

Merged
merged 3 commits into from
Jun 27, 2022
Merged

Improve display of rights statements #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0b2d18
fix import script
helrond Jun 27, 2022
da9c310
turn rights bases into list
helrond Jun 27, 2022
95ff2df
move rights display box higher
helrond Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bag_transfer/templates/parts/rights_table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
30 changes: 15 additions & 15 deletions bag_transfer/templates/transfers/detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion scripts/import_sample_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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