Merge lp:~nigelbabu/summit/nuke-brainstorm into lp:summit

[Nigel Babu]

Removed the brainstorm code out of summit.

Removed the brainstorm code out of summit as discussed in bug #783291

[James Westby (james-w)]

Hi,

547 + trackcolor = models.CharField(max_length=15)

I don't think we want that as part of this change, but otherwise
this looks good. Always nice to delete a lot of code :-)

Thanks,

James

review: Approve

[lp:~nigelbabu/summit/nuke-brainstorm]

118. By Nigel Babu on 2011-06-10

Removed code that was accidentally added.

[Chris Johnston (cjohnston)]

Looks good to me.

review: Approve

=== removed directory 'summit/brainstorm'
=== removed file 'summit/brainstorm/__init__.py'
--- summit/brainstorm/__init__.py	2010-03-05 10:33:36 +0000
+++ summit/brainstorm/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# Ubuntu Developer Summit web application
-# Copyright (C) 2008, 2009, 2010 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.

=== removed file 'summit/brainstorm/admin.py'
--- summit/brainstorm/admin.py	2010-03-05 10:33:36 +0000
+++ summit/brainstorm/admin.py	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-# Ubuntu Developer Summit web application
-# Copyright (C) 2008, 2009, 2010 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from django.core.exceptions import PermissionDenied
-from django.contrib import admin
-from django.shortcuts import render_to_response
-from django.template import RequestContext
-from django.utils.encoding import force_unicode
-from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext as _
-
-from summit.brainstorm.models import Idea
-
-from summit.brainstorm.forms import IdeaForm
-
-__all__ = (
-)
-
-
-class IdeaAdmin(admin.ModelAdmin):
-    list_display = ('url', 'title')
-    fieldsets = (
-        (None, {
-            'fields': ('id', 'title', 'url'),
-        }),
-    )
-
-    add_form = IdeaForm
-
-    def add_view(self, request):
-        if not self.has_add_permission(request):
-            raise PermissionDenied
-
-        new_idea = None
-        if request.method == 'POST':
-            form = self.add_form(request.POST)
-            if form.is_valid():
-                # We're using the wrong field, so this is wrong
-                new_idea = form.cleaned_data['idea']
-                self.log_addition(request, new_idea)
-
-                return self.response_add(request, new_idea)
-        else:
-            form = self.add_form()
-
-        context = {
-            'title': _('Add %s') % force_unicode(self.model._meta.verbose_name),
-            'form': form,
-            'is_popup': '_popup' in request.REQUEST,
-            'add': True,
-            'change': False,
-            'has_add_permission': self.has_add_permission(request),
-            'has_delete_permission': self.has_delete_permission(request, new_idea),
-            'has_change_permission': self.has_change_permission(request, new_idea),
-            'has_file_field': False,
-            'has_absolute_url': False,
-            'opts': self.model._meta,
-            'save_as': False,
-            'root_path': self.admin_site.root_path,
-            'show_delete': False,
-            'media': mark_safe(self.media + form.media),
-            'app_label': self.model._meta.app_label,
-        }
-        return render_to_response('admin/brainstorm/idea/add_form.html',
-                                  context,
-                                  context_instance=RequestContext(request))
-
-admin.site.register(Idea, IdeaAdmin)

=== removed file 'summit/brainstorm/fields.py'
--- summit/brainstorm/fields.py	2010-03-05 10:33:36 +0000
+++ summit/brainstorm/fields.py	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-# Ubuntu Developer Summit web application
-# Copyright (C) 2008, 2009, 2010 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import re
-import urlparse
-
-from django import forms
-from django.forms.util import ValidationError
-from django.utils.translation import ugettext_lazy as _
-
-from summit.brainstorm.models import Idea
-from summit.brainstorm.widgets import BrainstormURLWidget
-
-__all__ = (
-    'BrainstormURLField',
-)
-
-
-class BrainstormURLField(forms.URLField):
-    # FIXME this is a little too magic
-    # we should have a field that simply validates a brainstorm url
-    # and a different field that validates an entire brainstorm idea ref
-
-    default_error_messages = {
-        'not_brainstorm': _(u'This URL does not appear to be for Brainstorm'),
-    }
-
-    valid_schemes = ("http", "https")
-    valid_netlocs = ("brainstorm.ubuntu.com", )
-    path_re = re.compile(r'^/idea/(\d+)/')
-
-    widget = BrainstormURLWidget
-
-    def clean(self, value):
-        url = super(BrainstormURLField, self).clean(value)
-
-        info = urlparse.urlsplit(url)
-        if info[0] not in self.valid_schemes:
-            raise ValidationError(self.error_messages['not_brainstorm'])
-        if info[1] not in self.valid_netlocs:
-            raise ValidationError(self.error_messages['not_brainstorm'])
-
-        match = self.path_re.match(info[2])
-        if not match:
-            raise ValidationError(self.error_messages['not_brainstorm'])
-
-        idea_id = match.group(1)
-
-        try:
-            idea = Idea.objects.get(pk=idea_id)
-        except Idea.DoesNotExist:
-            import urllib2
-            from BeautifulSoup import BeautifulSoup
-            try:
-                u = urllib2.urlopen(url)
-                soup = BeautifulSoup(u)
-            except urllib2.HTTPError:
-                raise ValidationError(self.error_messages['not_brainstorm'])
-
-            try:
-                title = soup('h1')[0].string
-                title.index("\nIdea\n")
-                title = title[title.index(":")+1:].strip()
-            except (IndexError, ValueError):
-                raise ValidationError(self.error_messages['not_brainstorm'])
-
-            idea = Idea.objects.create(id=idea_id, url=url, title=title)
-
-        return idea

=== removed file 'summit/brainstorm/forms.py'
--- summit/brainstorm/forms.py	2010-03-05 10:33:36 +0000
+++ summit/brainstorm/forms.py	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# Ubuntu Developer Summit web application
-# Copyright (C) 2008, 2009, 2010 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from django import forms
-
-from summit.brainstorm.fields import BrainstormURLField
-
-__all__ = (
-    'IdeaForm',
-)
-
-
-class IdeaForm(forms.Form):
-    idea = BrainstormURLField()

=== removed file 'summit/brainstorm/models.py'
--- summit/brainstorm/models.py	2010-03-05 10:33:36 +0000
+++ summit/brainstorm/models.py	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-# Ubuntu Developer Summit web application
-# Copyright (C) 2008, 2009, 2010 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from django.db import models
-
-__all__ = (
-    'Idea',
-)
-
-
-class Idea(models.Model):
-    id = models.IntegerField(primary_key=True)
-    title = models.CharField(max_length=2047)
-    url = models.URLField()
-
-    class Meta:
-        ordering = ('id', )
-
-    def __unicode__(self):
-        return u'Idea #%d: %s' % (self.id, self.title)

=== removed directory 'summit/brainstorm/templates'
=== removed directory 'summit/brainstorm/templates/admin'
=== removed directory 'summit/brainstorm/templates/admin/brainstorm'
=== removed directory 'summit/brainstorm/templates/admin/brainstorm/idea'
=== removed file 'summit/brainstorm/templates/admin/brainstorm/idea/add_form.html'
--- summit/brainstorm/templates/admin/brainstorm/idea/add_form.html	2010-03-05 10:33:36 +0000
+++ summit/brainstorm/templates/admin/brainstorm/idea/add_form.html	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-{% extends "admin/change_form.html" %}
-{% load i18n %}
-
-{% block after_field_sets %}
-
-<p>Visit <a href="http://brainstorm.ubuntu.com/" target="_new">Ubuntu Brainstorm</a>
-to find a relevant idea for this meeting.  Copy the URL and paste into the
-box below.</p>
-
-<table>
-<tr>
-<td><label for="id_idea" class="required">{% trans 'URL' %}:</label></td>
-<td>{{ form.idea.errors }}{{ form.idea }}{{ form.idea.help_text }}</td>
-</tr>
-</table>
-
-{% endblock %}

=== removed file 'summit/brainstorm/views.py'
--- summit/brainstorm/views.py	2010-03-05 10:33:36 +0000
+++ summit/brainstorm/views.py	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-# Ubuntu Developer Summit web application
-# Copyright (C) 2008, 2009, 2010 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from django.http import HttpResponse, HttpResponseServerError
-from django.utils.html import escape
-
-from summit.brainstorm.forms import IdeaForm
-
-__all__ = (
-    'lookup',
-)
-
-
-def lookup(request):
-    if request.method == 'GET':
-        form = IdeaForm(request.GET)
-        if form.is_valid():
-            idea = form.cleaned_data['idea']
-
-            xml = u"<idea>\n"
-            xml += u"  <id>%s</id>\n" % escape(idea.id)
-            xml += u"  <title>%s</title>\n" % escape(idea.title)
-            xml += u"  <url>%s</url>\n" % escape(idea.url)
-            xml += u"</idea>\n"
-
-            return HttpResponse(xml, mimetype='text/xml')
-        else:
-            xml = u"<errors>\n"
-            for error in form.errors['idea']:
-                xml += u"  <error>%s</error>\n" % escape(unicode(error))
-            xml += u"</errors>\n"
-
-            return HttpResponse(xml, mimetype='text/xml')
-    else:
-        return HttpResponseServerError('<h1>Wrong method</h1>')

=== removed file 'summit/brainstorm/widgets.py'
--- summit/brainstorm/widgets.py	2010-03-05 10:33:36 +0000
+++ summit/brainstorm/widgets.py	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-# Ubuntu Developer Summit web application
-# Copyright (C) 2008, 2009, 2010 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from django import forms
-
-__all__ = (
-    'BrainstormURLWidget',
-)
-
-
-class BrainstormURLWidget(forms.TextInput):
-
-    class Media:
-        js = ('ajax.js', 'brainstorm/lookup.js')
-
-    def __init__(self, attrs={}):
-        new_attrs = attrs.copy()
-        new_attrs.update({'class': 'BrainstormURLField',
-                          'size': '30'})
-        super(BrainstormURLWidget, self).__init__(new_attrs)

=== removed directory 'summit/media/brainstorm'
=== removed file 'summit/media/brainstorm/lookup.js'
--- summit/media/brainstorm/lookup.js	2010-03-05 10:33:36 +0000
+++ summit/media/brainstorm/lookup.js	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-var Brainstorm = {
-    init: function() {
-	// Locate Brainstorm URL fields
-	var inputs = document.getElementsByTagName('INPUT');
-	for (var i = 0; i < inputs.length; i++) {
-	    var input = inputs[i];
-
-	    if (input.getAttribute('type') == 'text'
-		&& input.className.match(/BrainstormURLField/)) {
-		input.addEventListener('blur', Brainstorm.init, false);
-		input.addEventListener('change', Brainstorm.update, false);
-
-		Brainstorm.lookup(input);
-	    }
-	}
-    },
-
-    update: function(ev) {
-	Brainstorm.lookup(this);
-    },
-
-    lookup: function(tag) {
-	var url = tag.value;
-	if (url == null || url == '')
-	    return;
-
-	Ajax("GET", "/brainstorm?idea=" + escape(url), Brainstorm.gotIdea,
-	     tag);
-    },
-
-    cleanTag: function(tag) {
-	var td = Brainstorm.findTD(tag);
-
-	// Get rid of any errors
-	var uls = td.getElementsByTagName('UL');
-	for (var i = 0; i < uls.length; i++) {
-	    var ul = uls[i];
-
-	    if (ul.className.match(/errorlist/))
-		ul.parentNode.removeChild(ul);
-	}
-
-	// Get rid of any info
-	var ps = td.getElementsByTagName('P');
-	for (var i = 0; i < ps.length; i++) {
-	    var p = ps[i];
-
-	    if (p.className.match(/result/))
-		p.parentNode.removeChild(p);
-	}
-    },
-
-    gotIdea: function(elem, tag) {
-	Brainstorm.cleanTag(tag);
-
-	if (elem.tagName == 'idea') {
-	    Brainstorm.updateInfo(tag, elem);
-	} else if (elem.tagName == 'errors') {
-	    Brainstorm.updateErrors(tag, elem);
-	}
-    },
-
-    findTD: function(tag) {
-	while (tag && tag.tagName != 'TD') {
-	    tag = tag.parentNode;
-	}
-
-	return tag
-    },
-
-    updateInfo: function(tag, elem) {
-	var td = Brainstorm.findTD(tag);
-
-	// Add result
-	var p = document.createElement('P');
-	p.className = 'result';
-
-	var id = elem.getElementsByTagName('id')[0].textContent;
-	var title = elem.getElementsByTagName('title')[0].textContent;
-
-	var text = document.createTextNode("Idea #" + id + ": " + title);
-	p.appendChild(text);
-
-	td.insertBefore(p, tag);//.nextSibling);
-    },
-
-    updateErrors: function(tag, elem) {
-	var td = Brainstorm.findTD(tag);
-
-	// Add new errors
-	var ul = document.createElement('UL');
-	ul.className = 'errorlist';
-
-	var errors = elem.getElementsByTagName('error');
-	for (var i = 0; i < errors.length; i++) {
-	    var error = errors[i];
-
-	    var li = document.createElement('LI');
-	    var text = document.createTextNode(error.textContent);
-	    li.appendChild(text);
-	    ul.appendChild(li);
-	}
-
-	td.insertBefore(ul, tag);
-    },
-};
-
-window.addEventListener('load', Brainstorm.init, false);

=== modified file 'summit/schedule/admin/meetingadmin.py'
--- summit/schedule/admin/meetingadmin.py	2011-05-09 17:09:28 +0000
+++ summit/schedule/admin/meetingadmin.py	2011-06-10 04:54:42 +0000
@@ -157,7 +157,6 @@
                        'type', 'tracks', 'topics'),
         }),
         ("References", {
-#            'fields': ('spec_url', 'wiki_url', 'brainstorm'),
             'fields': ('spec_url', 'wiki_url', 'pad_url'),
         }),
         ("Scheduling details", {

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2011-05-22 19:14:22 +0000
+++ summit/schedule/models/meetingmodel.py	2011-06-10 04:54:42 +0000
@@ -24,7 +24,6 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.conf import settings
 from django.core.urlresolvers import reverse
-#from summit.brainstorm.models import Idea
 
 from summit.schedule.fields import NameField
 
@@ -90,7 +89,6 @@
                                verbose_name="Wiki URL")
     pad_url = models.URLField(verify_exists=False,
                                verbose_name="Pad URL", null=True, blank=True)
-#    brainstorm = models.ManyToManyField(Idea, blank=True)
     slots = models.IntegerField(default=1)
     private = models.BooleanField(default=False)
     # FIXME attendees must be for the same summit

=== removed file 'summit/sponsor/templates/sponsor/step1.old.html'
--- summit/sponsor/templates/sponsor/step1.old.html	2010-03-05 10:33:36 +0000
+++ summit/sponsor/templates/sponsor/step1.old.html	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-{% extends "base.html" %}
-
-{% block head %}
-{{ form.media }}
-{% endblock %}
-
-{% block content %}
-<h1>Request Sponsorship</h1>
-<h2>Brainstorm discussions</h2>
-<p>
-UDS is all about discussing ideas and producing plans for developing them,
-you should already have in mind some ideas that you want to discuss or even
-lead the development of, and certainly some general topics that interest
-you.
-</p>
-<ol>
-<li>Visit <a href="http://brainstorm.ubuntu.com/" target="_new">Ubuntu Brainstorm</a>
-    to find the ideas that interest you.</li>
-<li>Copy the idea URL from Brainstorm and paste into the <b>URL</b> box below.</li>
-<li>Choose the closest matching conference <b>Topic</b> for the idea.</li>
-<li>Indicate what your <b>Participation</b> will be, it's ok to say you're
-    not interested if you just want the idea discussed by others.</li>
-<li>Repeat for as many ideas as you like (the form should grow automatically).</li>
-</ol>
-
-<form method="post">
-<table class="formset">
-<tr><th>Brainstorm URL</th><th>Topic</th><th>Participation</th></tr>
-{{ form }}
-</table>
-<input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
-{{ previous_fields|safe }}
-<input type="submit" value="Next"/>
-</form>
-{% endblock %}