Subject:FOSSEE forum registration and category

Description:
1) Registartion
2) added fossee category
3) removed Issues
4) removed Tutorials
5) resolve MyQuestion and MyAnswer Uid problem

3 files changed, 26 insertions, 11 deletions

diff --git a/website/forms.py b/website/forms.py
index 14f4d2d..d6f281c 100644
--- a/website/forms.py
+++ b/website/forms.py
@@ -4,11 +4,22 @@ from website.models import *
 #from spoken_auth.models import TutorialDetails
 from django.db.models import Q
 class NewQuestionForm(forms.ModelForm):
-    category = forms.ModelChoiceField(widget = forms.Select(attrs = {}), queryset = FossCategory.objects.order_by('name'), empty_label = "Select a category", error_messages = {'required':'Categoty field required.'})
-    tutorial = forms.ModelChoiceField(widget = forms.Select(attrs = {}), queryset = Issue.objects.order_by('name'), empty_label = "Select a Issue", error_messages = {'required':'Issue field required.'})
+    category = forms.ModelChoiceField(widget = forms.Select(attrs = {}), 
+    					queryset = FossCategory.objects.order_by('name'), 
+    					empty_label = "Select a category", 
+    					error_messages = {'required':'Categoty field required.'})
+    					
+    '''tutorial = forms.ModelChoiceField(widget = forms.Select(attrs = {}), q
+    					ueryset = Issue.objects.order_by('name'), 
+    					empty_label = "Select a Issue", 
+    					error_messages = {'required':'Issue field required.'})'''
+    '''class Meta:
+        model = Question
+        fields = ['category', 'tutorial', 'title', 'body']'''
+        
     class Meta:
         model = Question
-        fields = ['category', 'tutorial', 'title', 'body']
+        fields = ['category', 'title', 'body']
 
     def __init__(self, *args, **kwargs):
         category = kwargs.pop('category', None)
diff --git a/website/models.py b/website/models.py
index e6816f3..0e11a4c 100644
--- a/website/models.py
+++ b/website/models.py
@@ -23,14 +23,16 @@ class Issue(models.Model):
 class Question(models.Model):
     user  = models.ForeignKey(User)
     category = models.ForeignKey(FossCategory)
-    tutorial = models.ForeignKey(Issue)
+    #tutorial = models.ForeignKey(Issue)
     title = models.CharField(max_length=200)
     body = models.TextField()
     date_created = models.DateTimeField(auto_now_add=True)
     date_modified = models.DateTimeField(auto_now=True)
     views = models.IntegerField(default=1)
     # votes = models.IntegerField(default=0)
-
+    def __unicode__(self):
+        return self.user
+        
     class Meta:
         get_latest_by = "date_created"
 
diff --git a/website/views.py b/website/views.py
index d80835d..9b413e5 100644
--- a/website/views.py
+++ b/website/views.py
@@ -212,7 +212,7 @@ def new_question(request):
             question = Question()
             question.user = request.user
             question.category = cleaned_data['category']
-            question.tutorial = cleaned_data['tutorial']
+            #question.tutorial = cleaned_data['tutorial']
             question.title = cleaned_data['title']
             question.body = cleaned_data['body'].encode('unicode_escape')
             question.views= 1 
@@ -224,12 +224,12 @@ def new_question(request):
                 The following new question has been posted in the Spoken Tutorial Forum: <br>
                 Title: <b>{0}</b><br>
                 Category: <b>{1}</b><br>
-                Tutorial: <b>{2}</b><br>
-                Link: <a href="{3}">{3}</a><br>
+                
+                Link: <a href="{2}">{2}</a><br>
             """.format(
                 question.title,
                 question.category, 
-                question.tutorial, 
+                #question.tutorial, 
                 'http://forums.spoken-tutorial.org/question/'+str(question.id)
             )
             email = EmailMultiAlternatives(
@@ -255,14 +255,16 @@ def new_question(request):
 # Notification Section
 @login_required
 def user_questions(request, user_id):
+    print "user_id"
+    print user_id
     marker = 0
     if 'marker' in request.GET:
         marker = int(request.GET['marker'])
 
     if str(user_id) == str(request.user.id):
-        total = Question.objects.filter(uid=user_id).count()
+        total = Question.objects.filter(user_id=user_id).count()
         total = int(total - (total % 10 - 10))
-        questions = Question.objects.filter(uid=user_id).order_by('date_created').reverse()[marker:marker+10]
+        questions = Question.objects.filter(user_id=user_id).order_by('date_created').reverse()[marker:marker+10]
         
         context = {
             'questions': questions,