m

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],
                     }
 

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):
         """

templates/client/includes/conference/conference_partner.html

@@ -78,13 +78,11 @@
                         </header>
                     </div>
                 {% endif %}
-{#                {% with event.organiser.all as organizers %}#}
+                {% if event.org %}
-{#                    {% if organizers|length > 0 %}#}
+                    <div>
-{#                        <div>#}
+                        {% trans 'Организатор' %}: {{ event.org }}
-{#                            {% trans 'Организатор' %}: {{ organisers.0.name }}#}
+                    </div>
-{#                        </div>#}
+                {% endif %}
-{#                    {% endif %}#}
-{#                {% endwith %}#}
             </div>
         </div>