7 files changed, 167 insertions, 0 deletions
diff --git a/sublab_project/news/__init__.py b/sublab_project/news/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/sublab_project/news/__init__.py
diff --git a/sublab_project/news/admin.py b/sublab_project/news/admin.py
new file mode 100644
index 0000000..ffead60
--- /dev/null
+++ b/sublab_project/news/admin.py
@@ -0,0 +1,15 @@
+from django.contrib import admin
+
+from news.models import News
+
+
+class NewsAdmin(admin.ModelAdmin):
+    prepopulated_fields = {'slug': ('title',)}
+    list_display = ('title', 'date_created', 'date_updated')
+
+    def save_model(self, request, obj, form, change):
+        if not obj.id:
+            obj.author = request.user
+        obj.save()
+
+admin.site.register(News, NewsAdmin)
diff --git a/sublab_project/news/migrations/0001_initial.py b/sublab_project/news/migrations/0001_initial.py
new file mode 100644
index 0000000..1d93edd
--- /dev/null
+++ b/sublab_project/news/migrations/0001_initial.py
@@ -0,0 +1,106 @@
+# 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 'News'
+        db.create_table('news_news', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('slug', self.gf('django.db.models.fields.SlugField')(unique=True, max_length=50, db_index=True)),
+            ('content', self.gf('django.db.models.fields.TextField')()),
+            ('content_html', self.gf('django.db.models.fields.TextField')()),
+            ('author', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('date_created', self.gf('django.db.models.fields.DateTimeField')()),
+            ('date_updated', self.gf('django.db.models.fields.DateTimeField')()),
+        ))
+        db.send_create_signal('news', ['News'])
+
+        # Adding M2M table for field projects on 'News'
+        db.create_table('news_news_projects', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('news', models.ForeignKey(orm['news.news'], null=False)),
+            ('project', models.ForeignKey(orm['projects.project'], null=False))
+        ))
+        db.create_unique('news_news_projects', ['news_id', 'project_id'])
+
+
+    def backwards(self, orm):
+        
+        # Deleting model 'News'
+        db.delete_table('news_news')
+
+        # Removing M2M table for field projects on 'News'
+        db.delete_table('news_news_projects')
+
+
+    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': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", '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'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            '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': {'ordering': "('name',)", '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'})
+        },
+        'news.news': {
+            'Meta': {'object_name': 'News'},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'content': ('django.db.models.fields.TextField', [], {}),
+            'content_html': ('django.db.models.fields.TextField', [], {}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {}),
+            'date_updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'projects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'news'", 'blank': 'True', 'to': "orm['projects.Project']"}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'projects.project': {
+            'Meta': {'object_name': 'Project'},
+            'contact_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'contact_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
+            'contact_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {}),
+            'date_updated': ('django.db.models.fields.DateTimeField', [], {}),
+            'description': ('django.db.models.fields.TextField', [], {}),
+            'description_html': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'})
+        }
+    }
+
+    complete_apps = ['news']
diff --git a/sublab_project/news/migrations/__init__.py b/sublab_project/news/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/sublab_project/news/migrations/__init__.py
diff --git a/sublab_project/news/models.py b/sublab_project/news/models.py
new file mode 100644
index 0000000..c0b54f7
--- /dev/null
+++ b/sublab_project/news/models.py
@@ -0,0 +1,29 @@
+import datetime
+
+from django.contrib.auth.models import User
+from django.db import models
+
+from projects.models import Project
+
+
+class News(models.Model):
+    """A news item.
+    """
+    title = models.CharField(max_length=255)
+    slug = models.SlugField(unique=True)
+    content = models.TextField()
+    content_html = models.TextField(editable=False)
+    projects = models.ManyToManyField(Project, blank=True,
+            related_name='news')
+    author = models.ForeignKey(User, editable=False)
+    date_created = models.DateTimeField(editable=False)
+    date_updated = models.DateTimeField(editable=False)
+
+    def __unicode__(self):
+        return self.title
+
+    def save(self, *args, **kwargs):
+        if not self.id:
+            self.date_created = datetime.datetime.now()
+        self.date_updated = datetime.datetime.now()
+        super(News, self).save(*args, **kwargs)
diff --git a/sublab_project/news/tests.py b/sublab_project/news/tests.py
new file mode 100644
index 0000000..501deb7
--- /dev/null
+++ b/sublab_project/news/tests.py
@@ -0,0 +1,16 @@
+"""
+This file demonstrates writing tests using the unittest module. These will pass
+when you run "manage.py test".
+
+Replace this with more appropriate tests for your application.
+"""
+
+from django.test import TestCase
+
+
+class SimpleTest(TestCase):
+    def test_basic_addition(self):
+        """
+        Tests that 1 + 1 always equals 2.
+        """
+        self.assertEqual(1 + 1, 2)
diff --git a/sublab_project/news/views.py b/sublab_project/news/views.py
new file mode 100644
index 0000000..60f00ef
--- /dev/null
+++ b/sublab_project/news/views.py
@@ -0,0 +1 @@
+# Create your views here.