Skip to content

Commit

Permalink
[#1290] Add 'related projects' inline to project admin
Browse files Browse the repository at this point in the history
  • Loading branch information
@KasperBrandt
KasperBrandt committed Mar 9, 2015
1 parent 5959a09 commit 0145017
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 28 deletions.
32 changes: 18 additions & 14 deletions akvo/rsr/admin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,13 +521,25 @@ class LegacyDataInline(NestedStackedInline):
)


class RelatedProjectInline(NestedStackedInline):
model = get_model('rsr', 'RelatedProject')
fields = ('id', 'related_project', 'relation')
fk_name = 'project'

def get_extra(self, request, obj=None, **kwargs):
if obj:
return 1 if obj.related_projects.count() == 0 else 0
else:
return 1


class ProjectAdmin(TimestampsAdminDisplayMixin, ObjectPermissionsModelAdmin, NestedModelAdmin):
model = get_model('rsr', 'project')
inlines = (
ProjectContactInline, PartnershipInline, ProjectDocumentInline, ProjectLocationInline, SectorInline,
BudgetItemAdminInLine, TransactionInline, ResultInline, LinkInline, ProjectConditionInline, CountryBudgetInline,
PlannedDisbursementInline, PolicyMarkerInline, RecipientCountryInline, RecipientRegionInline, LegacyDataInline,
BenchmarkInline, GoalInline,
RelatedProjectInline, ProjectContactInline, PartnershipInline, ProjectDocumentInline, ProjectLocationInline,
SectorInline, BudgetItemAdminInLine, TransactionInline, ResultInline, LinkInline, ProjectConditionInline,
CountryBudgetInline, PlannedDisbursementInline, PolicyMarkerInline, RecipientCountryInline,
RecipientRegionInline, LegacyDataInline, BenchmarkInline, GoalInline,
)
save_as = True

Expand All @@ -537,9 +549,8 @@ class ProjectAdmin(TimestampsAdminDisplayMixin, ObjectPermissionsModelAdmin, Nes
u'This section should contain the top-level information about your project which will be publicly '
u'available and used within searches. Try to keep your Title and Subtitle short and snappy.'
),
'fields': ('title', 'subtitle', 'iati_activity_id', 'status', 'hierarchy', 'date_start_planned',
'date_start_actual', 'date_end_planned', 'date_end_actual', 'language', 'currency',
'donate_button'),
'fields': ('title', 'subtitle', 'iati_activity_id', 'status', 'date_start_planned', 'date_start_actual',
'date_end_planned', 'date_end_actual', 'language', 'currency', 'donate_button', 'hierarchy'),
}),
(_(u'Contact Information'), {
'description': u'<p style="margin-left:0; padding-left:0; margin-top:1em; width:75%%;">%s</p>' % _(
Expand Down Expand Up @@ -1047,10 +1058,3 @@ def formfield_for_foreignkey(self, db_field, request=None, **kwargs):
return super(EmploymentAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)

admin.site.register(get_model('rsr', 'Employment'), EmploymentAdmin)


class RelatedProjectAdmin(admin.ModelAdmin):
model = get_model('rsr', 'RelatedProject')
list_display = ('project', 'related_project', 'relation')

admin.site.register(get_model('rsr', 'RelatedProject'), RelatedProjectAdmin)
33 changes: 19 additions & 14 deletions akvo/templates/admin/rsr/project/change_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,55 +70,57 @@ <h2>{% trans 'Adding and Editing Projects.' %}</h2>

{% for fieldset in adminform %}
{% include "admin/includes/fieldset.html" %}
{% if forloop.counter == 2 %}
{% if forloop.counter == 1 %}
{% with inline_admin_formset=inline_admin_formsets.0 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
{% endif %}
{% if forloop.counter == 2 %}
{% with inline_admin_formset=inline_admin_formsets.1 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
{% endif %}
{% if forloop.counter == 4 %}
{% with inline_admin_formset=inline_admin_formsets.1 %}
{% with inline_admin_formset=inline_admin_formsets.2 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
{% endif %}
{% if forloop.counter == 7 %}
{% with inline_admin_formset=inline_admin_formsets.2 %}
{% with inline_admin_formset=inline_admin_formsets.3 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
{% endif %}
{% if forloop.counter == 8 %}
{% with inline_admin_formset=inline_admin_formsets.3 %}
{% with inline_admin_formset=inline_admin_formsets.4 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
{% endif %}
{% if forloop.counter == 9 %}
{% with inline_admin_formset=inline_admin_formsets.4 %}
{% with inline_admin_formset=inline_admin_formsets.5 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
{% endif %}
{% if forloop.counter == 10 %}
{% with inline_admin_formset=inline_admin_formsets.5 %}
{% with inline_admin_formset=inline_admin_formsets.6 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
{% endif %}
{% if forloop.counter == 11 %}
{% with inline_admin_formset=inline_admin_formsets.6 %}
{% with inline_admin_formset=inline_admin_formsets.7 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
{% endif %}
{% if forloop.counter == 12 %}
{% with inline_admin_formset=inline_admin_formsets.7 %}
{% with inline_admin_formset=inline_admin_formsets.8 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
{% endif %}
{% if forloop.counter == 13 %}
{% with inline_admin_formset=inline_admin_formsets.8 %}
{% with inline_admin_formset=inline_admin_formsets.9 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
{% endif %}
{% if forloop.counter == 15 %}
{% with inline_admin_formset=inline_admin_formsets.9 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
{% with inline_admin_formset=inline_admin_formsets.10 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
Expand All @@ -137,14 +139,17 @@ <h2>{% trans 'Adding and Editing Projects.' %}</h2>
{% with inline_admin_formset=inline_admin_formsets.15 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
{% endif %}
{% if forloop.counter == 16 %}
{% with inline_admin_formset=inline_admin_formsets.16 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
{% endif %}
{% if forloop.counter == 16 %}
{% with inline_admin_formset=inline_admin_formsets.17 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
{% with inline_admin_formset=inline_admin_formsets.18 %}
{% include inline_admin_formset.opts.template %}
{% endwith %}
{% endif %}
{% endfor %}

Expand Down

0 comments on commit 0145017

Please sign in to comment.