Merge lp:~mhall119/loco-team-portal/579828 into lp:loco-team-portal

[Michael Hall]

Uses some modified bits of code from the Django Admin app to allow a popup window creating new venues without leaving the Event edit page.

Requires an update of ubuntu_website

[lp:~mhall119/loco-team-portal/579828]

197. By Daniel Holbach on 2010-07-21

merged lp:~nhandler/loco-directory/fixes-lp-607552

198. By Daniel Holbach on 2010-07-21

updated translation template

[Daniel Holbach (dholbach)]

A few quick things:
 - we need to use our version of "reverse"
 - a left-over print

Which part is borrowed from which part of Django Admin? How was it modified?

Is copy imported somewhere?

Is all of this needed? Or can we drop some parts?

review: Needs Fixing

[lp:~mhall119/loco-team-portal/579828]

199. By Chris Johnston on 2010-07-26

Makes template and text changes to fix the /events/history/ page

[Daniel Holbach (dholbach)]

Which part is borrowed from which part of Django Admin? How was it modified?

review: Needs Information

[lp:~mhall119/loco-team-portal/579828]

200. By Daniel Holbach on 2010-07-27

merged lp:~chrisjohnston/loco-directory/bugfix-lp-607615 and resolved conflicts

202. By Michael Hall <mhall@mhall-laptop> on 2010-07-21

Added import copy and remove debugging print statement

203. By Michael Hall <mhall@mhall-laptop> on 2010-07-28

Revert back to using admin media for add link icon and related object javascript

204. By Michael Hall <mhall@mhall-laptop> on 2010-07-28

Remove unused media

205. By Michael Hall on 2010-07-29

Removed unused reverse function import

Unmerged revisions

=== added file 'loco_directory/common/widgets.py'
--- loco_directory/common/widgets.py	1970-01-01 00:00:00 +0000
+++ loco_directory/common/widgets.py	2010-07-28 13:18:43 +0000
@@ -0,0 +1,59 @@
+# Modified copy of django.contrib.admin.widgets.RelatedFieldWidgetWrapper
+# Removed reverences to admin_site, and instead accept a popup_url
+
+from django import forms
+from django.conf import settings
+from django.core.urlresolvers import reverse
+from django.utils.translation import ugettext as _
+from django.utils.safestring import mark_safe
+import copy
+
+class PopupRelatedFieldWidgetWrapper(forms.Widget):
+    """
+    This class is a wrapper to a given widget to add the add icon for the
+    admin interface.
+    """
+    def __init__(self, widget, popup_url):
+        self.is_hidden = widget.is_hidden
+        self.needs_multipart_form = widget.needs_multipart_form
+        self.attrs = widget.attrs
+        self.choices = widget.choices
+        self.widget = widget
+        self.popup_url = popup_url
+
+    def __deepcopy__(self, memo):
+        obj = copy.copy(self)
+        obj.widget = copy.deepcopy(self.widget, memo)
+        obj.attrs = self.widget.attrs
+        memo[id(self)] = obj
+        return obj
+
+    def _media(self):
+        wm = self.widget.media
+        wm.add_js(['%sjs/admin/RelatedObjectLookups.js'%settings.ADMIN_MEDIA_PREFIX,])
+        return wm
+    media = property(_media)
+
+    def render(self, name, value, *args, **kwargs):
+
+        self.widget.choices = self.choices
+        output = [self.widget.render(name, value, *args, **kwargs)]
+        output.append(u'<a href="%s" class="add-another" id="add_id_%s" onclick="return showAddAnotherPopup(this);"> ' % \
+            (self.popup_url, name))
+        output.append(u'<img src="%simg/admin/icon_addlink.gif" width="10" height="10" alt="%s"/></a>' % (settings.ADMIN_MEDIA_PREFIX, _('Add Another')))
+        return mark_safe(u''.join(output))
+
+    def build_attrs(self, extra_attrs=None, **kwargs):
+        "Helper function for building an attribute dictionary."
+        self.attrs = self.widget.build_attrs(extra_attrs=None, **kwargs)
+        return self.attrs
+
+    def value_from_datadict(self, data, files, name):
+        return self.widget.value_from_datadict(data, files, name)
+
+    def _has_changed(self, initial, data):
+        return self.widget._has_changed(initial, data)
+
+    def id_for_label(self, id_):
+        return self.widget.id_for_label(id_)
+
 
=== modified file 'loco_directory/events/forms.py'
--- loco_directory/events/forms.py	2010-06-19 21:35:39 +0000
+++ loco_directory/events/forms.py	2010-07-28 13:18:43 +0000
@@ -2,6 +2,7 @@
 
 from django import forms
 from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse
 
 from models import BaseEvent, GlobalEvent, TeamEvent, Attendee, TeamEventComment
 from venues.models import Venue
@@ -60,6 +61,8 @@
     def __init__(self, *args, **kargs):
         super(TeamEventForm, self).__init__(*args, **kargs)
         self.fields['venue'].choices = self.grouped_venue_list()
+        from common.widgets import PopupRelatedFieldWidgetWrapper
+        self.fields['venue'].widget = PopupRelatedFieldWidgetWrapper(self.fields['venue'].widget, reverse('venue-new'))
         
     def grouped_venue_list(self):
         """
 
=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2010-07-18 16:34:12 +0000
+++ loco_directory/settings.py	2010-07-28 13:18:43 +0000
@@ -100,6 +100,7 @@
 if uw_import:
     TEMPLATE_CONTEXT_PROCESSORS += (
         "ubuntu_website.media_processor",
+        "ubuntu_website.popup_check",
     )
     TEMPLATE_DIRS += (
         ubuntu_website.TEMPLATE_DIR,
 
=== modified file 'loco_directory/templates/venues/venue_update.html'
--- loco_directory/templates/venues/venue_update.html	2010-06-24 19:18:57 +0000
+++ loco_directory/templates/venues/venue_update.html	2010-07-28 13:18:43 +0000
@@ -30,7 +30,7 @@
     	<table>
         	{{ form.as_table }}
     	</table>
-    	<p><input type="submit" value="Submit" /></p>
+    	<p>{% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %}<input type="submit" value="Submit" /></p>
     </form>
 </article>
 
 
=== modified file 'loco_directory/venues/views.py'
--- loco_directory/venues/views.py	2010-06-19 20:20:12 +0000
+++ loco_directory/venues/views.py	2010-07-28 13:18:43 +0000
@@ -2,9 +2,10 @@
 from django.shortcuts import render_to_response
 from django.shortcuts import get_object_or_404
 from django.contrib.auth.decorators import login_required
-from django.http import HttpResponseRedirect
+from django.http import HttpResponse, HttpResponseRedirect
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
+from django.utils.html import escape
 from django.db.models import Q
 
 from models import Venue
@@ -47,12 +48,18 @@
     """
     new venue
     """
+    venue_object = Venue()
     if request.method == 'POST':		
-        form = VenueForm(data=request.POST)
+        form = VenueForm(data=request.POST, instance=venue_object)
         if form.is_valid():
             form.save()
             request.user.message_set.create(message=_('New Venue created'))
-            return HttpResponseRedirect( reverse( 'venue-list' ) )
+            if request.REQUEST.has_key('_popup'):
+                return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script>' % \
+                    # escape() calls force_unicode.
+                    (escape(venue_object.pk), escape(venue_object)))
+            else:
+                return HttpResponseRedirect( reverse( 'venue-list' ) )
     else:
         form = VenueForm()