summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Procfile.dev1
-rw-r--r--newsdiff/core/admin.py3
-rw-r--r--newsdiff/core/fixtures/initial_data.json1
-rw-r--r--newsdiff/core/migrations/0002_auto__add_newsdiffuser.py112
-rw-r--r--newsdiff/core/models.py5
-rw-r--r--newsdiff/settings/base.py2
-rw-r--r--requirements.txt1
7 files changed, 124 insertions, 1 deletions
diff --git a/Procfile.dev b/Procfile.dev
new file mode 100644
index 0000000..848adfd
--- /dev/null
+++ b/Procfile.dev
@@ -0,0 +1 @@
+web: python manage.py runserver
diff --git a/newsdiff/core/admin.py b/newsdiff/core/admin.py
index 8c38f3f..481afd5 100644
--- a/newsdiff/core/admin.py
+++ b/newsdiff/core/admin.py
@@ -1,3 +1,4 @@
from django.contrib import admin
+from .models import *
-# Register your models here.
+admin.site.register(NewsDiffUser)
diff --git a/newsdiff/core/fixtures/initial_data.json b/newsdiff/core/fixtures/initial_data.json
new file mode 100644
index 0000000..e11c3f3
--- /dev/null
+++ b/newsdiff/core/fixtures/initial_data.json
@@ -0,0 +1 @@
+[{"pk": 1, "model": "core.newsdiffuser", "fields": {"username": "admin", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": true, "last_login": "2013-12-08T10:56:44.710Z", "groups": [], "user_permissions": [], "password": "pbkdf2_sha256$12000$F9X9T0fdSDU7$Il0q6V96eD91KU1C6fg+qR0BOfQAO033ZCTkNhBYrIY=", "email": "ad@min.com", "date_joined": "2013-12-08T10:56:18.462Z"}}] \ No newline at end of file
diff --git a/newsdiff/core/migrations/0002_auto__add_newsdiffuser.py b/newsdiff/core/migrations/0002_auto__add_newsdiffuser.py
new file mode 100644
index 0000000..0f9bfc3
--- /dev/null
+++ b/newsdiff/core/migrations/0002_auto__add_newsdiffuser.py
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as 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 'NewsDiffUser'
+ db.create_table(u'core_newsdiffuser', (
+ (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('password', self.gf('django.db.models.fields.CharField')(max_length=128)),
+ ('last_login', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)),
+ ('is_superuser', self.gf('django.db.models.fields.BooleanField')(default=False)),
+ ('username', self.gf('django.db.models.fields.CharField')(unique=True, max_length=30)),
+ ('first_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)),
+ ('last_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)),
+ ('email', self.gf('django.db.models.fields.EmailField')(max_length=75, blank=True)),
+ ('is_staff', self.gf('django.db.models.fields.BooleanField')(default=False)),
+ ('is_active', self.gf('django.db.models.fields.BooleanField')(default=True)),
+ ('date_joined', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)),
+ ))
+ db.send_create_signal(u'core', ['NewsDiffUser'])
+
+ # Adding M2M table for field groups on 'NewsDiffUser'
+ m2m_table_name = db.shorten_name(u'core_newsdiffuser_groups')
+ db.create_table(m2m_table_name, (
+ ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+ ('newsdiffuser', models.ForeignKey(orm[u'core.newsdiffuser'], null=False)),
+ ('group', models.ForeignKey(orm[u'auth.group'], null=False))
+ ))
+ db.create_unique(m2m_table_name, ['newsdiffuser_id', 'group_id'])
+
+ # Adding M2M table for field user_permissions on 'NewsDiffUser'
+ m2m_table_name = db.shorten_name(u'core_newsdiffuser_user_permissions')
+ db.create_table(m2m_table_name, (
+ ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+ ('newsdiffuser', models.ForeignKey(orm[u'core.newsdiffuser'], null=False)),
+ ('permission', models.ForeignKey(orm[u'auth.permission'], null=False))
+ ))
+ db.create_unique(m2m_table_name, ['newsdiffuser_id', 'permission_id'])
+
+
+ def backwards(self, orm):
+ # Deleting model 'NewsDiffUser'
+ db.delete_table(u'core_newsdiffuser')
+
+ # Removing M2M table for field groups on 'NewsDiffUser'
+ db.delete_table(db.shorten_name(u'core_newsdiffuser_groups'))
+
+ # Removing M2M table for field user_permissions on 'NewsDiffUser'
+ db.delete_table(db.shorten_name(u'core_newsdiffuser_user_permissions'))
+
+
+ models = {
+ u'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ u'auth.permission': {
+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ u'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'}),
+ u'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'})
+ },
+ u'core.haaretzarticle': {
+ 'Meta': {'object_name': 'HaaretzArticle'},
+ 'date': ('django.db.models.fields.DateTimeField', [], {}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'subtitle': ('django.db.models.fields.CharField', [], {'max_length': '300'}),
+ 'text': ('django.db.models.fields.TextField', [], {}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '140'}),
+ 'url': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ u'core.haaretzimage': {
+ 'Meta': {'object_name': 'HaaretzImage'},
+ 'article': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.HaaretzArticle']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+ 'origin_url': ('django.db.models.fields.CharField', [], {'max_length': '200'})
+ },
+ u'core.newsdiffuser': {
+ 'Meta': {'object_name': 'NewsDiffUser'},
+ '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+ u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ }
+ }
+
+ complete_apps = ['core'] \ No newline at end of file
diff --git a/newsdiff/core/models.py b/newsdiff/core/models.py
index 0bbb0b2..546b1cd 100644
--- a/newsdiff/core/models.py
+++ b/newsdiff/core/models.py
@@ -1,7 +1,12 @@
+from django.contrib.auth.models import AbstractUser
from django.db import models
from django.utils.timezone import now as tz_now
+class NewsDiffUser(AbstractUser):
+ pass
+
+
class HaaretzArticle(models.Model):
url = models.CharField(max_length=200)
title = models.CharField(max_length=140)
diff --git a/newsdiff/settings/base.py b/newsdiff/settings/base.py
index e6ca023..c0e3e39 100644
--- a/newsdiff/settings/base.py
+++ b/newsdiff/settings/base.py
@@ -86,6 +86,8 @@ INSTALLED_APPS = (
'newsdiff.core'
)
+AUTH_USER_MODEL = 'core.NewsDiffUser'
+
SITE_ID = 1
SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'
diff --git a/requirements.txt b/requirements.txt
index 9f89c2d..ec9b7a3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,6 +8,7 @@ billiard==3.3.0.11
celery==3.1.6
django-reversion==1.8.0
django-storages==1.1.8
+honcho==0.5.0
kombu==3.0.7
psycopg2==2.5.1
pytz==2013.8
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-15 18:22:14 +0000