Skip to content

Commit 0160e2f

Browse files
derekjkellerderekjkeller
authored
Merge pull request #125 from rice-crc/develop
Merge develop into main
2 parents 9616199 + a65be40 commit 0160e2f

File tree

3 files changed

+80
-67
lines changed

3 files changed

+80
-67
lines changed

‎api/document/templates/single_doc.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<h2>{{ zs.zotero_title }}</h2>
2-
<h3>{{ zs.zotero_date }} --> <a href="http://127.0.0.1:8000/admin/document/zoterosource/{{ zs.id }}/change/" target="_blank">Edit</a></h3>
2+
<h3>{{ zs.zotero_date }} --> <a href="/admin/document/zoterosource/{{ zs.id }}/change/" target="_blank">Edit</a></h3>
33
<p>Zotero link: <a href="{{ zs.zotero_web_page_url }}">{{ zs.zotero_web_page_url }}</a></p>
44
<p>Library collection item listing: <a href="{{ zs.item_url }}">{{ zs.item_url }}</a></p>
55
<hr/>
@@ -27,7 +27,7 @@ <h4>Pages</h4>
2727
</td>
2828
<td>
2929
{% if spc.source_page.transcription %}
30-
<p><b><a href="http://127.0.0.1:8000/admin/document/sourcepage/{{ spc.source_page.id }}/change/" target="_blank">Edit Transcript Here</a></b></p>
30+
<p><b><a href="/admin/document/sourcepage/{{ spc.source_page.id }}/change/" target="_blank">Edit Transcript Here</a></b></p>
3131
<p>
3232
{{ spc.source_page.transcription }}
3333
</p>
@@ -45,12 +45,12 @@ <h4>Linked entities</h4>
4545

4646
<ol>
4747
{% for v in zs.voyages.all %}
48-
<li>Voyage #{{ v.id }} : {{ v.ship.ship_name}} --> <a href="http://127.0.0.1:8000/admin/voyage/voyage/{{ v.id }}/change/" target="_blank">Edit</a></li>
48+
<li>Voyage #{{ v.id }} : {{ v.ship.ship_name}} --> <a href="/admin/voyage/voyage/{{ v.id }}/change/" target="_blank">Edit</a></li>
4949
{% endfor %}
5050
</ol>
5151

5252
<ol>
5353
{% for ep in zs.enslaved_people.all %}
54-
<li>Person: {{ ep.id }} : {{ ep.documented_name }} --> <a href="http://127.0.0.1:8000/admin/past/enslaved/{{ ep.id }}/change/" target="_blank">Edit</a></li>
54+
<li>Person: {{ ep.id }} : {{ ep.documented_name }} --> <a href="/admin/past/enslaved/{{ ep.id }}/change/" target="_blank">Edit</a></li>
5555
{% endfor %}
5656
</ol>

‎api/past/admin.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class EnslavedInRelationInline(admin.StackedInline):
100100
# admin.site.register(EnslavementRelation,EnslavementRelationAdmin)
101101
# admin.site.register(EnslaverRole,EnslaverRoleAdmin)
102102
admin.site.register(EnslaverIdentity,EnslaverIdentityAdmin)
103-
# admin.site.register(EnslaverAlias,EnslaverAliasAdmin)
103+
admin.site.register(EnslaverAlias,EnslaverAliasAdmin)
104104
# admin.site.register(LanguageGroup,LanguageGroupAdmin)
105105
# admin.site.register(ModernCountry,ModernCountryAdmin)
106106
# admin.site.register(AltLanguageGroupName)

‎api/voyage/admin.py

+75-62
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ class VoyageCrewInline(admin.StackedInline):
88
model=VoyageCrew
99
max_num=1
1010
classes = ['collapse']
11+
fields = [
12+
'crew_voyage_outset',
13+
'crew_died_complete_voyage'
14+
]
1115

1216
#
1317

@@ -27,21 +31,26 @@ class VoyageDatesInline(admin.StackedInline):
2731
'voyage_completed_sparsedate',
2832
'imp_voyage_began_sparsedate',
2933
'imp_departed_africa_sparsedate',
30-
'imp_arrival_at_port_of_dis_sparsedate'
34+
'imp_arrival_at_port_of_dis_sparsedate',
35+
'date_departed_africa',
36+
'voyage_completed',
37+
'imp_departed_africa',
38+
'imp_length_home_to_disembark',
39+
'imp_length_leaving_africa_to_disembark'
3140
]
3241
verbose_name_plural="Voyage Dates"
3342

34-
# class PlaceAdmin(admin.ModelAdmin):
35-
# model=Place
36-
# search_fields=['place']
37-
#
38-
# class RegionAdmin(admin.ModelAdmin):
39-
# model=Region
40-
# search_fields=['region']
41-
#
42-
# class BroadRegionAdmin(admin.ModelAdmin):
43-
# model=BroadRegion
44-
# search_fields=['broad_region']
43+
class PlaceAdmin(admin.ModelAdmin):
44+
model=Place
45+
search_fields=['place']
46+
47+
class RegionAdmin(admin.ModelAdmin):
48+
model=Region
49+
search_fields=['region']
50+
51+
class BroadRegionAdmin(admin.ModelAdmin):
52+
model=BroadRegion
53+
search_fields=['broad_region']
4554

4655

4756

@@ -134,49 +143,53 @@ class VoyageShipInline(admin.StackedInline):
134143
class VoyageItineraryInline(admin.StackedInline):
135144
model = VoyageItinerary
136145
max_num = 1
137-
# autocomplete_fields=[
138-
# 'imp_broad_region_voyage_begin',
139-
# 'port_of_departure',
140-
# 'int_first_port_emb',
141-
# 'int_third_port_dis',
142-
# 'int_fourth_port_dis',
143-
# 'int_third_place_region_slave_landing',
144-
# 'int_fourth_place_region_slave_landing',
145-
# 'int_second_port_emb',
146-
# 'int_first_region_purchase_slaves',
147-
# 'int_second_region_purchase_slaves',
148-
# 'int_first_port_dis',
149-
# 'int_second_port_dis',
150-
# 'int_first_region_slave_landing',
151-
# 'imp_principal_region_slave_dis',
152-
# 'int_second_place_region_slave_landing',
153-
# 'first_place_slave_purchase',
154-
# 'second_place_slave_purchase',
155-
# 'third_place_slave_purchase',
156-
# 'first_region_slave_emb',
157-
# 'second_region_slave_emb',
158-
# 'third_region_slave_emb',
159-
# 'port_of_call_before_atl_crossing',
160-
# 'first_landing_place',
161-
# 'second_landing_place',
162-
# 'third_landing_place',
163-
# 'first_landing_region',
164-
# 'second_landing_region',
165-
# 'third_landing_region',
166-
# 'place_voyage_ended',
167-
# 'region_of_return',
168-
# 'broad_region_of_return',
169-
# 'imp_port_voyage_begin',
170-
# 'imp_region_voyage_begin',
171-
# 'imp_broad_region_voyage_begin',
172-
# 'principal_place_of_slave_purchase',
173-
# 'imp_principal_place_of_slave_purchase',
174-
# 'imp_principal_region_of_slave_purchase',
175-
# 'imp_broad_region_of_slave_purchase',
176-
# 'principal_port_of_slave_dis',
177-
# 'imp_principal_port_slave_dis',
178-
# 'imp_broad_region_slave_dis'
179-
# ]
146+
autocomplete_fields=[
147+
'imp_broad_region_voyage_begin',
148+
'port_of_departure',
149+
'int_first_port_emb',
150+
'int_third_port_dis',
151+
'int_fourth_port_dis',
152+
'int_third_place_region_slave_landing',
153+
'int_fourth_place_region_slave_landing',
154+
'int_second_port_emb',
155+
'int_first_region_purchase_slaves',
156+
'int_second_region_purchase_slaves',
157+
'int_first_port_dis',
158+
'int_second_port_dis',
159+
'int_first_region_slave_landing',
160+
'imp_principal_region_slave_dis',
161+
'int_second_place_region_slave_landing',
162+
'first_place_slave_purchase',
163+
'second_place_slave_purchase',
164+
'third_place_slave_purchase',
165+
'first_region_slave_emb',
166+
'second_region_slave_emb',
167+
'third_region_slave_emb',
168+
'first_landing_place',
169+
'second_landing_place',
170+
'third_landing_place',
171+
'first_landing_region',
172+
'second_landing_region',
173+
'third_landing_region',
174+
'place_voyage_ended',
175+
'imp_port_voyage_begin',
176+
'principal_place_of_slave_purchase',
177+
'imp_principal_place_of_slave_purchase',
178+
'imp_principal_region_of_slave_purchase',
179+
'imp_broad_region_of_slave_purchase',
180+
'principal_port_of_slave_dis',
181+
'imp_principal_port_slave_dis',
182+
'imp_broad_region_slave_dis'
183+
]
184+
exclude= [
185+
'port_of_call_before_atl_crossing',
186+
'number_of_ports_of_call',
187+
'region_of_return',
188+
'broad_region_of_return',
189+
'imp_region_voyage_begin',
190+
'imp_broad_region_voyage_begin'
191+
192+
]
180193
classes = ['collapse']
181194
#
182195

@@ -209,8 +222,8 @@ class VoyageOutcomeInline(admin.StackedInline):
209222

210223
class EnslaverAliasConnectionInline(admin.StackedInline):
211224
model = EnslaverVoyageConnection
212-
readonly_fields=['enslaver_alias','role','order']
213-
# autocomplete_fields=['enslaver_alias',]
225+
# readonly_fields=['enslaver_alias','role','order']
226+
autocomplete_fields=['enslaver_alias',]
214227
classes = ['collapse']
215228
extra=0
216229

@@ -225,17 +238,17 @@ class VoyageAdmin(admin.ModelAdmin):
225238
VoyageShipInline,
226239
VoyageSlavesNumbersInline
227240
)
228-
fields=['voyage_id','dataset','voyage_groupings','voyage_in_cd_rom']
241+
fields=['voyage_id','dataset','voyage_in_cd_rom']
229242
list_display=('voyage_id',)
230243
search_fields=('voyage_id',)
231244
model=Voyage
232245
#
233246
#
234247
admin.site.register(Voyage, VoyageAdmin)
235248
# admin.site.register(VoyageDates)
236-
# admin.site.register(Place,PlaceAdmin)
237-
# admin.site.register(Region,RegionAdmin)
238-
# admin.site.register(BroadRegion,BroadRegionAdmin)
249+
admin.site.register(Place,PlaceAdmin)
250+
admin.site.register(Region,RegionAdmin)
251+
admin.site.register(BroadRegion,BroadRegionAdmin)
239252
# admin.site.register(VoyageSources, VoyageSourcesAdmin)
240253
# admin.site.register(ParticularOutcome, ParticularOutcomeAdmin)
241254
# admin.site.register(SlavesOutcome, SlavesOutcomeAdmin)
@@ -244,4 +257,4 @@ class VoyageAdmin(admin.ModelAdmin):
244257
# admin.site.register(Resistance, ResistanceAdmin)
245258
# admin.site.register(Nationality, NationalityAdmin)
246259
# admin.site.register(TonType, TonTypeAdmin)
247-
# admin.site.register(RigOfVessel, RigOfVesselAdmin)
260+
admin.site.register(RigOfVessel)

0 commit comments

Comments
 (0)