richleland / django-happening / changeset / d4e59e583e53

Up to file-list happening/news/admin.py:

@@ -9,7 +9,7 @@ except:
 if TinyMCE:
     class NewsItemForm(forms.ModelForm):
-        long_text = forms.CharField(widget=TinyMCE(attrs={'cols': 80, 'rows': 30}))
+        long_text = forms.CharField(required=False, widget=TinyMCE(attrs={'cols': 80, 'rows': 30}))
         class Meta:
             model = NewsItem

Up to file-list happening/news/fixtures/test-data-news.yaml:

             News Item, visible: true}
     model: news.newsitem
     pk: 1
 -   fields: {end_date: null, long_text: '', pub_date: !!timestamp '2010-01-20 11:19:43',
         short_text: '', slug: another-news-item, subhead: '', title: Another
             News Item, visible: true}
     model: news.newsitem
     pk: 2

Up to file-list happening/news/migrations/0005_make_long_text_optional.py:

 from south.db import db
 from django.db import models
 from happening.news.models import *
 class Migration:
     def forwards(self, orm):
         # Changing field 'NewsItem.long_text'
         # (to signature: django.db.models.fields.TextField(blank=True))
         db.alter_column('news_newsitem', 'long_text', orm['news.newsitem:long_text'])
     def backwards(self, orm):
         # Changing field 'NewsItem.long_text'
         # (to signature: django.db.models.fields.TextField())
         db.alter_column('news_newsitem', 'long_text', orm['news.newsitem:long_text'])
     models = {
         'news.category': {
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True', 'db_index': 'True'})
         },
         'news.newsitem': {
             'Meta': {'unique_together': "(('pub_date', 'slug'),)"},
             'breaking': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
             'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['news.Category']", 'null': 'True', 'blank': 'True'}),
             'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
             'external_url': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '200', 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'long_text': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
             'pub_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'short_text': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
             'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'db_index': 'True'}),
             'subhead': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
             'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'visible': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'})
+        }
+    }
     complete_apps = ['news']

Up to file-list happening/news/models.py:

@@ -27,7 +27,7 @@ class NewsItem(models.Model):
     slug = models.SlugField()
     subhead = models.CharField(max_length=255, blank=True)
     short_text = models.CharField(max_length=50, blank=True)
-    long_text = models.TextField()
+    long_text = models.TextField(blank=True)
     external_url = models.URLField(verify_exists=False, default="", blank=True)
     objects = NewsItemManager()
@@ -49,3 +49,7 @@ class NewsItem(models.Model):
             'day': self.pub_date.strftime('%d'),
             'slug': self.slug
         })
     @property
     def has_detail(self):
         return True if self.long_text else False

Up to file-list happening/news/tests.py:

@@ -48,3 +48,9 @@ class NewsTests(MainTests):
         })
         response = self.client.get(url)
         self.assertEquals(response.status_code, 200)
     def test_news_has_detail(self):
         news_item = NewsItem.objects.get(pk=1)
         self.assertEquals(news_item.has_detail, True)
         news_item = NewsItem.objects.get(pk=2)
         self.assertEquals(news_item.has_detail, False)

commit 41:	d4e59e583e53
parent 40:	a3c213b6ea64
branch:	default