mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-16 21:12:13 +00:00
Started work on Person modeling
This commit is contained in:
2
.idea/PyRIGS.iml
generated
2
.idea/PyRIGS.iml
generated
@@ -11,7 +11,7 @@
|
||||
</component>
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="jdk" jdkName="Python 2.7.5 virtualenv at ~/pyrigs" jdkType="Python SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="sass-stdlib" level="application" />
|
||||
</component>
|
||||
|
||||
2
.idea/dataSources.xml
generated
2
.idea/dataSources.xml
generated
@@ -4,7 +4,7 @@
|
||||
<data-source source="LOCAL" name="Django default" uuid="09730cb6-cd27-4034-9959-d242e7905a51">
|
||||
<driver-ref>sqlite.xerial</driver-ref>
|
||||
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
|
||||
<jdbc-url>jdbc:sqlite:C:\Users\psytp\PycharmProjects\PyRIGS\db.sqlite3</jdbc-url>
|
||||
<jdbc-url>jdbc:sqlite:$PROJECT_DIR$/db.sqlite3</jdbc-url>
|
||||
<libraries />
|
||||
</data-source>
|
||||
</component>
|
||||
|
||||
@@ -2,6 +2,7 @@ from django.db import models
|
||||
from django.contrib.auth.models import AbstractUser
|
||||
from django.conf import settings
|
||||
import hashlib
|
||||
import reversion
|
||||
|
||||
# Create your models here.
|
||||
class Profile(AbstractUser):
|
||||
@@ -13,4 +14,26 @@ class Profile(AbstractUser):
|
||||
url = ""
|
||||
if settings.USE_GRAVATAR or settings.USE_GRAVATAR is None:
|
||||
url = "https://www.gravatar.com/avatar/" + hashlib.md5(self.email).hexdigest() + "?d=identicon&s=500"
|
||||
return url
|
||||
return url
|
||||
|
||||
class ModelComment(models.Model):
|
||||
user = models.ForeignKey(settings.AUTH_USER_MODEL)
|
||||
postedAt = models.DateTimeField(auto_now=True)
|
||||
|
||||
message = models.TextField()
|
||||
|
||||
@reversion.register
|
||||
class Person(models.Model):
|
||||
name = models.CharField(max_length=50)
|
||||
phone = models.CharField(max_length=15, blank=True, null=True)
|
||||
email = models.EmailField(blank=True, null=True)
|
||||
|
||||
address = models.TextField(blank=True, null=True)
|
||||
|
||||
comments = models.ManyToManyField('ModelComment')
|
||||
|
||||
def __unicode__(self):
|
||||
string = self.name
|
||||
if self.comments:
|
||||
string += "*"
|
||||
return string
|
||||
@@ -3,6 +3,7 @@ from django.contrib import admin
|
||||
from django.contrib.staticfiles.urls import static
|
||||
from django.conf import settings
|
||||
import RIGS
|
||||
from RIGS import views
|
||||
|
||||
urlpatterns = patterns('',
|
||||
# Examples:
|
||||
@@ -10,5 +11,8 @@ urlpatterns = patterns('',
|
||||
# url(r'^blog/', include('blog.urls')),
|
||||
|
||||
url('^user/login/$', 'RIGS.views.login', name='login'),
|
||||
|
||||
# People
|
||||
url(r'^people/$', views.PersonIndex.as_view(), name='person')
|
||||
)
|
||||
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
from django.shortcuts import render
|
||||
from django.http.response import HttpResponseRedirect
|
||||
from django.views import generic
|
||||
import models
|
||||
|
||||
# Create your views here.
|
||||
def login(request, **kwargs):
|
||||
@@ -8,4 +10,7 @@ def login(request, **kwargs):
|
||||
return HttpResponseRedirect(request.REQUEST.get('next', '/'))
|
||||
else:
|
||||
from django.contrib.auth.views import login
|
||||
return login(request)
|
||||
return login(request)
|
||||
|
||||
class PersonIndex(generic.ListView):
|
||||
model = models.Person
|
||||
Reference in New Issue
Block a user