Merge lp:~dholbach/harvest/734746 into lp:harvest

[Daniel Holbach]

[lp:~dholbach/harvest/734746]

313. By Daniel Holbach on 2011-06-28

install python-django-south

[Dylan McCall (dylanmccall)]

Oooh, nice. This appears to be working for me. I'm assuming that Harvest's update script isn't grabbing long descriptions yet, so I added some manually and they're showing up :)

[Dylan McCall (dylanmccall)]

review: Approve

[Daniel Holbach (dholbach)]

These should be working already:
http://daniel.holba.ch/merges.json,"Outstanding merges from Debian"
http://people.canonical.com/~ubuntu-security/d2u/debian-security.json,"Debian security update merges and syncs"
http://people.ubuntuwire.org/~ajmitch/missing-fixes-rc.oneiric.json,"Debian release critical bugs"
http://reports.qa.ubuntu.com/reports/sponsoring/sponsoring.json,"needs sponsoring"

[Daniel Holbach (dholbach)]

Does it generally look OK for you? Or do you feel we should change things UI wise?

=== modified file 'INSTALL'
--- INSTALL	2010-07-05 15:49:39 +0000
+++ INSTALL	2011-06-28 14:19:27 +0000
@@ -1,4 +1,4 @@
-1. sudo apt-get install python-django python-launchpadlib python-django-openid-auth bzr 
+1. sudo apt-get install python-django python-launchpadlib python-django-openid-auth bzr python-django-south
 
 ---
 Optional for Harvest hackers:
@@ -21,6 +21,7 @@
  - cd harvest
  - cp -i local_settings.py.sample local_settings.py
  - ./manage.py syncdb
+ - ./manage.py migrate
  - ./manage.py init-harvest
  - ./manage.py update
  - ./manage.py runserver

=== modified file 'harvest/media/css/opportunities.css'
--- harvest/media/css/opportunities.css	2011-05-05 18:44:51 +0000
+++ harvest/media/css/opportunities.css	2011-06-28 14:19:27 +0000
@@ -268,9 +268,12 @@
 	line-height:1em;
 }
 .opportunity[data-opportunity-irrelevant] > .opportunity-header > .opportunity-description,
-.opportunity[data-opportunity-applied] > .opportunity-header > .opportunity-description {
+.opportunity[data-opportunity-irrelevant] > .opportunity-header > .opportunity-long-description,
+.opportunity[data-opportunity-applied] > .opportunity-header > .opportunity-description,
+.opportunity[data-opportunity-applied] > .opportunity-header > .opportunity-long-description {
 	text-decoration:line-through;
 }
+.opportunity-header > a.opportunity-long-description,
 .opportunity-header > a.opportunity-description {
 	color:#000000;
 	font-size:16px;

=== modified file 'harvest/opportunities/management/commands/updateopportunities.py'
--- harvest/opportunities/management/commands/updateopportunities.py	2010-12-08 08:15:50 +0000
+++ harvest/opportunities/management/commands/updateopportunities.py	2011-06-28 14:19:27 +0000
@@ -35,6 +35,10 @@
                                                          opportunitylist=op_list,
                                                          experience=op_list.experience)
                     opportunity.last_updated = op_list.last_updated
+                    if entry.has_key("description"):
+                        opportunity.long_description = entry["description"]
+                    if entry.has_key("severity"):
+                        opportunity.severity = entry["severity"]
                     opportunity.valid = True
                     opportunity.save()
             else:

=== added directory 'harvest/opportunities/migrations'
=== added file 'harvest/opportunities/migrations/0001_initial.py'
--- harvest/opportunities/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ harvest/opportunities/migrations/0001_initial.py	2011-06-28 14:19:27 +0000
@@ -0,0 +1,202 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+    
+    def forwards(self, orm):
+        
+        # Adding model 'PackageSet'
+        db.create_table('opportunities_packageset', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.SlugField')(max_length=40, db_index=True)),
+        ))
+        db.send_create_signal('opportunities', ['PackageSet'])
+
+        # Adding model 'SourcePackage'
+        db.create_table('opportunities_sourcepackage', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.SlugField')(max_length=70, db_index=True)),
+        ))
+        db.send_create_signal('opportunities', ['SourcePackage'])
+
+        # Adding M2M table for field packagesets on 'SourcePackage'
+        db.create_table('opportunities_sourcepackage_packagesets', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('sourcepackage', models.ForeignKey(orm['opportunities.sourcepackage'], null=False)),
+            ('packageset', models.ForeignKey(orm['opportunities.packageset'], null=False))
+        ))
+        db.create_unique('opportunities_sourcepackage_packagesets', ['sourcepackage_id', 'packageset_id'])
+
+        # Adding model 'OpportunityList'
+        db.create_table('opportunities_opportunitylist', (
+            ('last_updated', self.gf('django.db.models.fields.DateTimeField')(null=True)),
+            ('description', self.gf('django.db.models.fields.TextField')(max_length=350)),
+            ('url', self.gf('django.db.models.fields.URLField')(max_length=200)),
+            ('explanation', self.gf('django.db.models.fields.URLField')(max_length=500, null=True)),
+            ('commentable', self.gf('django.db.models.fields.BooleanField')(default=True, blank=True)),
+            ('experience', self.gf('django.db.models.fields.IntegerField')(default=0)),
+            ('featured', self.gf('django.db.models.fields.BooleanField')(default=False, blank=True)),
+            ('active', self.gf('django.db.models.fields.BooleanField')(default=True, blank=True)),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.SlugField')(max_length=70, db_index=True)),
+        ))
+        db.send_create_signal('opportunities', ['OpportunityList'])
+
+        # Adding model 'Opportunity'
+        db.create_table('opportunities_opportunity', (
+            ('applied', self.gf('django.db.models.fields.BooleanField')(default=False, blank=True)),
+            ('last_updated', self.gf('django.db.models.fields.DateTimeField')(null=True)),
+            ('description', self.gf('django.db.models.fields.TextField')(max_length=350)),
+            ('url', self.gf('django.db.models.fields.URLField')(max_length=350)),
+            ('since', self.gf('django.db.models.fields.DateTimeField')(null=True)),
+            ('experience', self.gf('django.db.models.fields.IntegerField')(default=0)),
+            ('reviewed', self.gf('django.db.models.fields.BooleanField')(default=False, blank=True)),
+            ('valid', self.gf('django.db.models.fields.BooleanField')(default=True, blank=True)),
+            ('opportunitylist', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['opportunities.OpportunityList'])),
+            ('sourcepackage', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['opportunities.SourcePackage'])),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+        ))
+        db.send_create_signal('opportunities', ['Opportunity'])
+
+        # Adding model 'Note'
+        db.create_table('opportunities_note', (
+            ('date', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+            ('text', self.gf('django.db.models.fields.CharField')(max_length=250)),
+            ('opportunity', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['opportunities.Opportunity'])),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('author', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+        ))
+        db.send_create_signal('opportunities', ['Note'])
+
+        # Adding model 'ActionLogEntry'
+        db.create_table('opportunities_actionlogentry', (
+            ('action', self.gf('django.db.models.fields.TextField')(max_length=200)),
+            ('timestamp', self.gf('django.db.models.fields.DateTimeField')()),
+            ('who', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('opportunity', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['opportunities.Opportunity'], blank=True)),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+        ))
+        db.send_create_signal('opportunities', ['ActionLogEntry'])
+    
+    
+    def backwards(self, orm):
+        
+        # Deleting model 'PackageSet'
+        db.delete_table('opportunities_packageset')
+
+        # Deleting model 'SourcePackage'
+        db.delete_table('opportunities_sourcepackage')
+
+        # Removing M2M table for field packagesets on 'SourcePackage'
+        db.delete_table('opportunities_sourcepackage_packagesets')
+
+        # Deleting model 'OpportunityList'
+        db.delete_table('opportunities_opportunitylist')
+
+        # Deleting model 'Opportunity'
+        db.delete_table('opportunities_opportunity')
+
+        # Deleting model 'Note'
+        db.delete_table('opportunities_note')
+
+        # Deleting model 'ActionLogEntry'
+        db.delete_table('opportunities_actionlogentry')
+    
+    
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'opportunities.actionlogentry': {
+            'Meta': {'object_name': 'ActionLogEntry'},
+            'action': ('django.db.models.fields.TextField', [], {'max_length': '200'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'opportunity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['opportunities.Opportunity']", 'blank': 'True'}),
+            'timestamp': ('django.db.models.fields.DateTimeField', [], {}),
+            'who': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'opportunities.note': {
+            'Meta': {'object_name': 'Note'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'opportunity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['opportunities.Opportunity']"}),
+            'text': ('django.db.models.fields.CharField', [], {'max_length': '250'})
+        },
+        'opportunities.opportunity': {
+            'Meta': {'object_name': 'Opportunity'},
+            'applied': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '350'}),
+            'experience': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'opportunitylist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['opportunities.OpportunityList']"}),
+            'reviewed': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'since': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'sourcepackage': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['opportunities.SourcePackage']"}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '350'}),
+            'valid': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'})
+        },
+        'opportunities.opportunitylist': {
+            'Meta': {'object_name': 'OpportunityList'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'commentable': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '350'}),
+            'experience': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'explanation': ('django.db.models.fields.URLField', [], {'max_length': '500', 'null': 'True'}),
+            'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'name': ('django.db.models.fields.SlugField', [], {'max_length': '70', 'db_index': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'opportunities.packageset': {
+            'Meta': {'object_name': 'PackageSet'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'db_index': 'True'})
+        },
+        'opportunities.sourcepackage': {
+            'Meta': {'object_name': 'SourcePackage'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.SlugField', [], {'max_length': '70', 'db_index': 'True'}),
+            'packagesets': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['opportunities.PackageSet']", 'null': 'True', 'symmetrical': 'False'})
+        }
+    }
+    
+    complete_apps = ['opportunities']

=== added file 'harvest/opportunities/migrations/0002_add_severity_and_long_desc.py'
--- harvest/opportunities/migrations/0002_add_severity_and_long_desc.py	1970-01-01 00:00:00 +0000
+++ harvest/opportunities/migrations/0002_add_severity_and_long_desc.py	2011-06-28 14:19:27 +0000
@@ -0,0 +1,122 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+    
+    def forwards(self, orm):
+        
+        # Adding field 'Opportunity.long_description'
+        db.add_column('opportunities_opportunity', 'long_description', self.gf('django.db.models.fields.TextField')(max_length=350, null=True), keep_default=False)
+
+        # Adding field 'Opportunity.severity'
+        db.add_column('opportunities_opportunity', 'severity', self.gf('django.db.models.fields.TextField')(max_length=20, null=True), keep_default=False)
+    
+    
+    def backwards(self, orm):
+        
+        # Deleting field 'Opportunity.long_description'
+        db.delete_column('opportunities_opportunity', 'long_description')
+
+        # Deleting field 'Opportunity.severity'
+        db.delete_column('opportunities_opportunity', 'severity')
+    
+    
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'opportunities.actionlogentry': {
+            'Meta': {'object_name': 'ActionLogEntry'},
+            'action': ('django.db.models.fields.TextField', [], {'max_length': '200'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'opportunity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['opportunities.Opportunity']", 'blank': 'True'}),
+            'timestamp': ('django.db.models.fields.DateTimeField', [], {}),
+            'who': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'opportunities.note': {
+            'Meta': {'object_name': 'Note'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'opportunity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['opportunities.Opportunity']"}),
+            'text': ('django.db.models.fields.CharField', [], {'max_length': '250'})
+        },
+        'opportunities.opportunity': {
+            'Meta': {'object_name': 'Opportunity'},
+            'applied': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '350'}),
+            'experience': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'long_description': ('django.db.models.fields.TextField', [], {'max_length': '350', 'null': 'True'}),
+            'opportunitylist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['opportunities.OpportunityList']"}),
+            'reviewed': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'severity': ('django.db.models.fields.TextField', [], {'max_length': '20', 'null': 'True'}),
+            'since': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'sourcepackage': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['opportunities.SourcePackage']"}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '350'}),
+            'valid': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'})
+        },
+        'opportunities.opportunitylist': {
+            'Meta': {'object_name': 'OpportunityList'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'commentable': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'max_length': '350'}),
+            'experience': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'explanation': ('django.db.models.fields.URLField', [], {'max_length': '500', 'null': 'True'}),
+            'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
+            'name': ('django.db.models.fields.SlugField', [], {'max_length': '70', 'db_index': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+        },
+        'opportunities.packageset': {
+            'Meta': {'object_name': 'PackageSet'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'db_index': 'True'})
+        },
+        'opportunities.sourcepackage': {
+            'Meta': {'object_name': 'SourcePackage'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.SlugField', [], {'max_length': '70', 'db_index': 'True'}),
+            'packagesets': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['opportunities.PackageSet']", 'null': 'True', 'symmetrical': 'False'})
+        }
+    }
+    
+    complete_apps = ['opportunities']

=== modified file 'harvest/opportunities/models.py'
--- harvest/opportunities/models.py	2011-05-02 20:59:38 +0000
+++ harvest/opportunities/models.py	2011-06-28 14:19:27 +0000
@@ -85,6 +85,8 @@
     valid = models.BooleanField(_("Valid"), default=True)
     experience = models.IntegerField(_("Difficulty"), choices=EXPERIENCE_CHOICES, default=0,
                                      help_text=_("Level of experience required for this specific opportunity."))
+    long_description = models.TextField(_("Long Description"), max_length=350, null=True)
+    severity = models.TextField(_("Severity"), max_length=20, null=True)
 
     class Meta:
         ordering = ['-last_updated']

=== modified file 'harvest/settings.py'
--- harvest/settings.py	2010-12-22 14:34:12 +0000
+++ harvest/settings.py	2011-06-28 14:19:27 +0000
@@ -113,6 +113,7 @@
     'filters',
     'services',
     'common',
+    'south',
 )
 
 if toolbar_available:

=== modified file 'harvest/templates/opportunities/include/opportunity.html'
--- harvest/templates/opportunities/include/opportunity.html	2011-05-04 04:14:35 +0000
+++ harvest/templates/opportunities/include/opportunity.html	2011-06-28 14:19:27 +0000
@@ -1,7 +1,11 @@
 {% load i18n %}
 
 <div class="opportunity-header">
-	<a href="{{opportunity.url}}" class="opportunity-description" target="_blank">{{ opportunity.description }}</a>
+        {% if opportunity.long_description %}
+		<a href="{{opportunity.url}}" class="opportunity-long-description" target="_blank">{{ opportunity.long_description }}</a>
+        {% else %}
+		<a href="{{opportunity.url}}" class="opportunity-description" target="_blank">{{ opportunity.description }}</a>
+        {% endif %}
 	<span class="actions">
 		{% if user.is_authenticated %}
 		<a href="{% url opportunity_edit opportunity.id %}?next={{request.get_full_path}}" target="_blank" class="opportunity-edit-button">{% trans 'edit' %}</a>

=== modified file 'harvest/templates/opportunities/opportunity_edit.html'
--- harvest/templates/opportunities/opportunity_edit.html	2011-05-04 03:22:59 +0000
+++ harvest/templates/opportunities/opportunity_edit.html	2011-06-28 14:19:27 +0000
@@ -3,7 +3,14 @@
 
 {% block extracss %}<link rel="stylesheet" href="{{ MEDIA_URL }}css/opportunities.css" />{% endblock %}
 
-{% block title %}{{ block.super }}: {{ opportunity.description }}{% endblock %}
+{% block title %}
+	{{ block.super }}: 
+	{% if opportunity.long_description %}
+		{{ opportunity.long_description }}
+	{% else %}
+		{{ opportunity.description }}
+	{% endif %]
+{% endblock %}
 
 {% block content %}
 <h1>Opportunity <a href="{{opportunity.url}}" class="opportunity-description" target="_blank">{{ opportunity.description }}</a> in {% with opportunity.sourcepackage.name as pkgname %}<a href="{% url single_package pkgname %}">{{ pkgname }}</a>{% endwith %}</h1>