Renamed model "admins" to "admin".

boards/admin.py

@@ -1,6 +1,6 b''
 from django.contrib import admin
-from boards.models import Post, Tag, Admins
+from boards.models import Post, Tag, Admin
 
 admin.site.register(Post)
 admin.site.register(Tag)
-admin.site.register(Admins)
+admin.site.register(Admin)

boards/models.py

@@ -1,96 +1,96 b''
 from django.db import models
 from django.utils import timezone
 
 NO_PARENT = -1
 NO_IP = '0.0.0.0'
 UNKNOWN_UA = ''
 DIR_IMAGES = 'images'
 
 class PostManager(models.Manager):
 
     def create_post(self, title, text, image = None, parent_id = NO_PARENT,
                     ip = NO_IP):
         post = self.create(title = title,
             text = text,
             pub_time = timezone.now(),
             parent = parent_id,
             image = image,
             poster_ip = ip,
             poster_user_agent = UNKNOWN_UA)
 
         return post
 
     def delete_post(self, post):
         children = self.filter(parent = post.id)
         for child in children:
             self.delete_post(child)
         post.delete()
 
     def delete_posts_by_ip(self, ip):
         posts = self.filter(poster_ip = ip)
         for post in posts:
             self.delete_post(post)
 
     def get_threads(self, tag = None):
         if tag is None:
             threads = self.filter(parent = NO_PARENT)
         else:
             threads = self.filter(parent = NO_PARENT, tag = tag)
 
         return threads
 
     def get_thread(self, opening_post_id):
         opening_post = self.get(opening_post_id)
         replies =  self.filter(parent = opening_post_id)
 
         return [opening_post, replies]
 
     def exists(self, post_id):
         posts = Post.objects.filter(id = post_id)
 
         return len(posts) > 0
 
     def is_admin(self, user, passw):
-        return Admins.objects.filter(name = user, password = passw) is not None
+        return Admin.objects.filter(name = user, password = passw) is not None
 
 
 class Tag(models.Model):
     """
     A tag is a text node assigned to the post. The tag serves as a board
     section. There can be multiple tags for each message
     """
 
     name = models.CharField(max_length = 100)
 
 
 class Post(models.Model):
     """A post is a message."""
 
     objects = PostManager()
 
     title = models.CharField(max_length = 100)
     pub_time = models.DateTimeField()
     text = models.TextField()
     image = models.ImageField(upload_to = DIR_IMAGES)
     poster_ip = models.IPAddressField()
     poster_user_agent = models.TextField()
     parent = models.BigIntegerField()
     tags = models.ManyToManyField(Tag)
 
     def __unicode__(self):
         return self.title + ' (' + self.text + ')'
 
 
-class Admins(models.Model):
+class Admin(models.Model):
     """
     Model for admin users
     """
 
     objects = PostManager()
 
     name = models.CharField(max_length=100)
     password = models.CharField(max_length=100)
 
     def __unicode__(self):
         return self.name + '/' + '*' * len(self.password)
 

boards/views.py

@@ -1,60 +1,62 b''
 from django.template import RequestContext
-from boards.models import Post, Admins
+from boards.models import Post, Admin
 from django.shortcuts import render
 from django.http import HttpResponseRedirect
 
 def index(request):
     # TODO Show a real index page with all threads list
     threads = Post.objects.get_threads()
 
     context = RequestContext(request)
     context['threads'] = None if len(threads) == 0 else threads
 
     return render(request, 'posting_general.html',
         context)
 
 def new_post(request):
     """Add a new post (in thread or as a reply)."""
 
     title = request.POST['title']
     text = request.POST['text']
 
     image = request.POST['image']
 
     # TODO Get tags list, download image (if link is given)
 
     post = Post.objects.create_post(title = title, text = text, image = image)
 
     # TODO Show the thread with a newly created post
 
 def tag(request):
     """Get all tag threads (posts without a parent)."""
 
     tag_name = request.GET['tag']
 
     posts = Post.objects.get_threads(tag = tag)
 
     # TODO Send a response with the post list
 
 def thread(request):
     """Get all thread posts"""
 
     opening_post_id = request.GET['id']
     posts = Post.objects.get_thread(opening_post_id)
 
     # TODO Show all posts for the current thread
 
 def login(request):
-    if 'name' in request.POST and 'password' in request.POST\
-            and Admins.objects.is_admin(request.POST['name'],
+    """Log in as admin"""
+
+    if 'name' in request.POST and 'password' in request.POST \
+            and Admin.objects.is_admin(request.POST['name'],
             request.POST['password']):
 
         if request.POST['name'] == 'ilyas':
             request.session['admin'] = True
             return HttpResponseRedirect('/boards')
         else:
 
             return render(request, 'login.html', {'error' : 'Login error'})
 
     else :
         return render(request, 'login.html', {})