diff --git a/conference/admin.py b/conference/admin.py index aebd21b0..fbf64878 100644 --- a/conference/admin.py +++ b/conference/admin.py @@ -291,7 +291,7 @@ class ConferenceView(AdminView): 'discount': obj.discount,'canceled': obj.canceled, 'moved': obj.moved, 'visitors': obj.visitors, 'members': obj.members, 'logo': obj.logo, 'audience': obj.audience.all().values_list('pk', flat=True), - 'partner': obj.partner, + 'partner': obj.partner, 'org': obj.org, # 'quality_label': [item for item, bool in obj.quality_label if bool==True], } diff --git a/photologue/models.py b/photologue/models.py index b5ee8d01..9bd045a9 100644 --- a/photologue/models.py +++ b/photologue/models.py @@ -727,10 +727,10 @@ class Photo(TranslatableModel, ImageModel): return self._meta.translations_model def admin_url(self): - return '/admin/photogallery/photo/%s'%self.slug + return '/admin/photogallery/photo/%s/'%self.slug def get_delete_url(self): - return settings.DEFAULT_HTTP_SCHEME + '://' + Site.objects.get_current().domain + '/admin/photogallery/photo/delete/%s'%self.pk + return '/admin/photogallery/photo/delete/%s/'%self.pk def generate_unique_slug(self): """ diff --git a/templates/client/includes/conference/conference_partner.html b/templates/client/includes/conference/conference_partner.html index 4ba5932b..cdd01767 100644 --- a/templates/client/includes/conference/conference_partner.html +++ b/templates/client/includes/conference/conference_partner.html @@ -78,13 +78,11 @@ {% endif %} -{# {% with event.organiser.all as organizers %}#} -{# {% if organizers|length > 0 %}#} -{#