Move quote model into local app

This commit is contained in:
Trever Fischer
2012-03-04 23:34:01 -05:00
parent 82222860c9
commit 8fc7372bbe
9 changed files with 108 additions and 16 deletions

View File

@@ -1,5 +1,6 @@
from piston.handler import AnonymousBaseHandler, BaseHandler
from profiles.models import MinecraftProfile, Quote
from profiles.models import MinecraftProfile
from local.models import Quote
from minecraft.models import MOTD, Server
from django.http import HttpResponse
from urllib2 import urlopen

View File

@@ -6,3 +6,4 @@ class CurrencyAdmin(admin.ModelAdmin):
search_fields = ('profile__mc_username',)
admin.site.register(models.CurrencyAccount, CurrencyAdmin)
admin.site.register(models.Quote)

7
local/context.py Normal file
View File

@@ -0,0 +1,7 @@
import models
def random_quote(request):
quote = models.Quote.objects.order_by('?')
if len(quote) > 0:
return {'quote': quote[0]}
return {}

View File

@@ -0,0 +1,91 @@
# 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):
try:
db.rename_table('profiles_quote', 'local_quote')
except DatabaseError, e:
# Adding model 'Quote'
db.create_table('local_quote', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('text', self.gf('django.db.models.fields.CharField')(max_length=50)),
))
db.send_create_signal('local', ['Quote'])
# Changing field 'CurrencyAccount.profile'
db.alter_column('local_currencyaccount', 'profile_id', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['minecraft.MinecraftProfile'], unique=True))
def backwards(self, orm):
db.rename_table('local_quote', 'profiles_quote')
# Changing field 'CurrencyAccount.profile'
db.alter_column('local_currencyaccount', 'profile_id', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['profiles.MinecraftProfile'], unique=True))
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'})
},
'local.currencyaccount': {
'Meta': {'object_name': 'CurrencyAccount'},
'balance': ('django.db.models.fields.FloatField', [], {'default': '3000'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'profile': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['minecraft.MinecraftProfile']", 'unique': 'True'}),
'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
'username': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
},
'local.quote': {
'Meta': {'object_name': 'Quote'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'text': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
'minecraft.minecraftprofile': {
'Meta': {'object_name': 'MinecraftProfile'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'mc_username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
}
}
complete_apps = ['local']

View File

@@ -15,6 +15,12 @@ class CurrencyAccount(models.Model):
if not self.username:
self.username = self.profile.mc_username
class Quote(models.Model):
text = models.CharField(max_length=50)
def __unicode__(self):
return self.text
def create_account(sender, instance, created, **kwargs):
if created:
CurrencyAccount.objects.create(profile=instance)

View File

@@ -1,4 +1,3 @@
import models
from django.contrib import admin
admin.site.register(models.Quote)
admin.site.register(models.Invite)

View File

@@ -1,11 +1,4 @@
import models
import forms
def random_quote(request):
quote = models.Quote.objects.order_by('?')
if len(quote) > 0:
return {'quote': quote[0]}
return {}
def login_form(request):
return {'login_form': forms.LoginForm()}

View File

@@ -14,9 +14,3 @@ class Invite(models.Model):
@models.permalink
def get_absolute_url(self):
return ('profiles.views.claimInvite', [], {'code': self.code})
class Quote(models.Model):
text = models.CharField(max_length=50)
def __unicode__(self):
return self.text

View File

@@ -167,7 +167,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
"django.core.context_processors.media",
"django.core.context_processors.static",
"django.contrib.messages.context_processors.messages",
"profiles.context.random_quote",
"local.context.random_quote",
"profiles.context.login_form",
"minecraft.context.server_info",
"appversion.context.git_version"