Skip to content

Commit

Permalink
Old basic cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Almad committed Jun 19, 2010
1 parent 66a691a commit c226ede
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 60 deletions.
4 changes: 2 additions & 2 deletions rpgrules/admin.py
@@ -1,5 +1,5 @@
from django.contrib import admin
from djangobaselibrary.sample.models import Spam, Type

admin.site.register([Spam, Type])
from rpgrules.models import Rule

admin.site.register(Rule)
68 changes: 12 additions & 56 deletions rpgrules/models.py
@@ -1,60 +1,16 @@
from django.db import models
from django.utils.translation import ugettext_lazy as _
#from django.utils.translation import ugettext_lazy as _

class Type(models.Model):
'''
just some model that will be refferenced by Spam
'''
name = models.CharField(max_length=255, unique=True)
description = models.TextField(null=True, blank=True)
class Rule(models.Model):
"""
Rule is "rpg rule". As we're not so intrested into details as rpgdb, definition
of rule is 'something we want to create extensions for and take track for it'
class Meta:
verbose_name = _('Type')
verbose_name_plural = _('Types')

def __unicode__(self):
return self.name

class Spam(models.Model):
'''
sample model from http://south.aeracode.org/wiki/Tutorial
'''
weight = models.FloatField()
expires = models.DateTimeField()
name = models.CharField(max_length=255)
count = models.IntegerField(null=True, blank=True)
type = models.IntegerField()

class Meta:
unique_together = (('name', 'expires'),)
verbose_name = _('Spam')
verbose_name_plural = _('Spam')

def __unicode__(self):
return self.name


# custom primary key testing
# http://www.djangoproject.com/documentation/models/custom_pk/

class Employee(models.Model):
employee_code = models.CharField(max_length=10, primary_key=True, db_column='code')
first_name = models.CharField(max_length=20)
last_name = models.CharField(max_length=20)

class Meta:
ordering = ('last_name', 'first_name')

def __unicode__(self):
return u"%s %s" % (self.first_name, self.last_name)

class Business(models.Model):
name = models.CharField(max_length=20, primary_key=True)
employees = models.ManyToManyField(Employee)

class Meta:
verbose_name_plural = 'businesses'

def __unicode__(self):
return self.name
Exact difference between where custom edition should be added and new rule
is left to admins.
Parent rule is used for hiearchy (as in 'DrD', 'DrD 1.6')
"""

parent = models.ForeignKey('self', default=None, null=True, blank=True)
name = models.CharField(max_length=150)

4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -2,8 +2,8 @@
import rpgrules

setup(
name = 'djangorpgrules',
version = djangobaselibrary.__versionstr__,
name = 'rpgrules',
version = rpgrules.__versionstr__,
description = 'RPG Rules',
long_description = '\n'.join((
'RPG rules',
Expand Down

0 comments on commit c226ede

Please sign in to comment.