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

[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

[Daniel Holbach (dholbach)]

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

review: Needs Information

[Michael Hall (mhall119)]

loco_directory/common/widgets.py is now the only borrowed code, which was necessary to point the popup window to a URL of our choosing, rather than a page from the admin site (which users wouldn't have permission to access).

[Daniel Holbach (dholbach)]

 - Module "ubuntu_website" does not define a "popup_check" callable request processor (at least on r13) - do I need to update? How can we make sure we document all the stuff that needs to be done for the next release, so we don't forget to tell IS?
 - "common/widgets.py:6: 'reverse' imported but unused"
 - they use "import django.utils.copycompat as copy" - does that make a difference?
 - Can we somehow avoid copying the code? I'm not 100% opposed to it, but I just wonder how we can stay up to date on changes in that piece of the code and how we'll maintain it.

The solution itself works nicely and is good stuff.

review: Needs Information

[Michael Hall (mhall119)]

Yes,ubuntu_website needs to be updated. Without sub-branches in bzr, I'm not sure how we can automatically keep it up to date. Perhaps we should just make updating that part of the normal LD release process?

I'm not sure how django.utils.copycompat differs, but it's what they used, so there must have been a reason for it.

We couldn't use the code from the admin app, because that would require giving everybody access to the admin app, since the popup it creates points to it's own pages.

I'll remove the unused 'reverse' import.

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

205. By Michael Hall on 2010-07-29

Removed unused reverse function import

[Daniel Holbach (dholbach)]

You're using copy instead of django.utils.copycompat.

Can we make the update of ubuntu_website part of init-ld?

[Michael Hall (mhall119)]

Again, I'm using what they used, I don't want to change stuff without knowing why or what effects it will have.

I can add the update to init-ld, but does that get called every release?

[Daniel Holbach (dholbach)]

> Again, I'm using what they used, I don't want to change stuff without knowing
> why or what effects it will have.

I did a diff against the maverick version, maybe you copied from somewhere else?

> I can add the update to init-ld, but does that get called every release?

We have to tell them: https://wiki.ubuntu.com/LoCoDirectory/ReleaseProcess

[Michael Hall (mhall119)]

I pulled it from the Lucid version.

Would it be easier to just tell them to cd into ubuntu_website and bzr pull?

[Daniel Holbach (dholbach)]

Merged, thanks a lot.

review: Approve

=== 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-29 12:07:42 +0000
@@ -0,0 +1,58 @@
+# 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.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-29 12:07:42 +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-29 12:07:42 +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-29 12:07:42 +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-29 12:07:42 +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()