Merge lp:~daker/ubuntu-api-website/fix.1275721 into lp:ubuntu-api-website

[Adnane Belmadiaf]

Code adjustments

=== modified file 'developer_network/apidocs/models.py'
--- developer_network/apidocs/models.py	2013-12-19 21:14:27 +0000
+++ developer_network/apidocs/models.py	2014-02-15 20:59:13 +0000
@@ -1,64 +1,63 @@
+# -*- coding: utf-8 -*-
+
 from django.db import models
-from common.models import Topic, Version, Section
-# Create your models here.
+from common.models import Section
 
 class Namespace(models.Model):
-    
-    class Meta:
-        ordering = ('name',)
-        
+
     platform_section = models.ForeignKey(Section)
     name = models.CharField(max_length=64)
     display_name = models.CharField(max_length=64, blank=True, default='')
-    
+
+    class Meta:
+        ordering = ('name',)
+
     def __unicode__(self):
-        return self.name
+        return u'%s' % self.name
 
 
 class Element(models.Model):
     'Displayable API Element'
-    
+
+    name = models.CharField(max_length=64)
+    description= models.CharField(max_length=256, blank=True, default='')
+    namespace = models.ForeignKey(Namespace, blank=True, null=True)
+
+    section = models.ForeignKey(Section)
+    fullname = models.CharField(max_length=128)
+    keywords = models.CharField(max_length=256, blank=True, default='')
+    data = models.TextField(blank=True, default='')
+
     class Meta:
         verbose_name = "Rendered Element"
         verbose_name_plural = "Rendered Elements"
         ordering = ('name',)
-        
-    name = models.CharField(max_length=64)
-    description= models.CharField(max_length=256, blank=True, default='')
-    namespace = models.ForeignKey(Namespace, blank=True, null=True)
-    
-    section = models.ForeignKey(Section)
-    fullname = models.CharField(max_length=128)
-    keywords = models.CharField(max_length=256, blank=True, default='')
-    data = models.TextField(blank=True, default='')
+
+    def __unicode__(self):
+        return u'%s' % self.fullname
 
     @property
     def platform_section(self):
         return self.section
-        
-    def __unicode__(self):
-        return self.fullname
 
 
 class Page(models.Model):
     'Displayable Page of non-Element content'
-    
+
+    slug = models.CharField(max_length=64)
+    title = models.CharField(max_length=64)
+    description= models.CharField(max_length=256, blank=True, default='')
+    namespace = models.ForeignKey(Namespace, blank=True, null=True)
+
+    section = models.ForeignKey(Section)
+    fullname = models.CharField(max_length=128)
+    keywords = models.CharField(max_length=256, blank=True, default='')
+    data = models.TextField(blank=True, default='')
+
     class Meta:
         verbose_name = "Rendered Page"
         verbose_name_plural = "Rendered Pages"
         ordering = ('slug',)
-        
-    slug = models.CharField(max_length=64)
-    title = models.CharField(max_length=64)
-    description= models.CharField(max_length=256, blank=True, default='')
-    namespace = models.ForeignKey(Namespace, blank=True, null=True)
-    
-    section = models.ForeignKey(Section)
-    fullname = models.CharField(max_length=128)
-    keywords = models.CharField(max_length=256, blank=True, default='')
-    data = models.TextField(blank=True, default='')
 
     def __unicode__(self):
-        return self.fullname
-
-
+        return u'%s' % self.fullname

=== added file 'developer_network/web/forms.py'
--- developer_network/web/forms.py	1970-01-01 00:00:00 +0000
+++ developer_network/web/forms.py	2014-02-15 20:59:13 +0000
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+
+from django.forms import ModelForm
+from django.contrib.auth.models import User
+
+from common.models import Topic, Version, Section
+from apidocs.models import Namespace, Element, Page
+from rest_framework.authtoken.models import Token
+
+
+class TopicForm(ModelForm):
+    class Meta:
+        model = Topic
+
+
+class VersionForm(ModelForm):
+    class Meta:
+        model = Version
+
+
+class SectionForm(ModelForm):
+    class Meta:
+        model = Section
+
+
+class NamespaceForm(ModelForm):
+    class Meta:
+        model = Namespace
+
+    def __init__(self, *args, **kargs):
+        if 'version' in kargs:
+            version = kargs['version']
+            del kargs['version']
+        elif hasattr(self, 'instance') and self.instance.section:
+            version = self.instance.section.topic_version
+        else:
+            version=None
+        super(NamespaceForm, self).__init__(*args, **kargs)
+        self.fields['platform_section'].queryset = Section.objects.filter(topic_version=version)
+
+
+class PageForm(ModelForm):
+    class Meta:
+        model = Page
+
+    def __init__(self, *args, **kargs):
+        if 'version' in kargs:
+            version = kargs['version']
+            del kargs['version']
+        elif hasattr(self, 'instance') and self.instance.section:
+            version = self.instance.section.topic_version
+        else:
+            version=None
+        super(PageForm, self).__init__(*args, **kargs)
+        self.fields['section'].queryset = Section.objects.filter(topic_version=version)
+        self.fields['namespace'].queryset = Namespace.objects.filter(platform_section__topic_version=version)
+
+
+class ElementForm(ModelForm):
+    class Meta:
+        model = Element
+
+    def __init__(self, *args, **kargs):
+        if 'version' in kargs:
+            version = kargs['version']
+            del kargs['version']
+        elif hasattr(self, 'instance') and self.instance.section:
+            version = self.instance.section.topic_version
+        else:
+            version=None
+        super(ElementForm, self).__init__(*args, **kargs)
+        self.fields['section'].queryset = Section.objects.filter(topic_version=version)
+        self.fields['namespace'].queryset = Namespace.objects.filter(platform_section__topic_version=version)
+
+
+class TokenForm(ModelForm):
+    class Meta:
+        model = Token
+        fields = ('user',)
+
+
+class UserForm(ModelForm):
+    class Meta:
+        model = User
+        fields = ('username',)

=== modified file 'developer_network/web/views.py'
--- developer_network/web/views.py	2014-02-07 18:39:18 +0000
+++ developer_network/web/views.py	2014-02-15 20:59:13 +0000
@@ -1,8 +1,9 @@
+# -*- coding: utf-8 -*-
+
 from django.shortcuts import render_to_response, get_object_or_404
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponseRedirect
 from django.core.urlresolvers import reverse
-from django.template import loader, RequestContext
-from django.forms import ModelForm
+from django.template import RequestContext
 from django.contrib.auth.models import User, Group
 
 from common.models import Topic, Version, Section
@@ -10,26 +11,25 @@
 from related.models import Snippet, Link, LINK_QUESTION, LINK_TUTORIAL
 from rest_framework.authtoken.models import Token
 
-# Create your views here.
+from forms import *
+
 def overview(request):
     topics = Topic.objects.all()
-    
+
     context = {
         'topics': topics,
     }
     return render_to_response('web/overview.html', context, RequestContext(request))
-    
+
+
 def topic_view(request, topic_name):
     topic = get_object_or_404(Topic, slug=topic_name)
-    
+
     context = {
         'topic': topic,
     }
     return render_to_response('web/distro.html', context, RequestContext(request))
 
-class TopicForm(ModelForm):
-    class Meta:
-        model = Topic
 
 def topic_edit(request, topic_id=0):
     if topic_id:
@@ -53,6 +53,7 @@
     }
     return render_to_response('web/topic_edit.html', context, RequestContext(request))
 
+
 def version_view(request, topic_name, release_version):
     version = get_object_or_404(Version, topic__slug=topic_name, slug=release_version)
 
@@ -74,7 +75,7 @@
             else:
                 break
         sorted_sections.insert(i, section)
-        
+
     first_column_size = 0
     for section in sorted_sections:
         section_size = section.namespace_set.count() + section.free_element_set().count() + 2  # Extra 2 for the section header
@@ -93,9 +94,6 @@
     }
     return render_to_response('web/release.html', context, RequestContext(request))
 
-class VersionForm(ModelForm):
-    class Meta:
-        model = Version
 
 def version_edit(request, topic_name, version_id=0):
     if version_id:
@@ -122,9 +120,6 @@
     }
     return render_to_response('web/version_edit.html', context, RequestContext(request))
 
-class SectionForm(ModelForm):
-    class Meta:
-        model = Section
 
 def section_edit(request, topic_name, version_name, section_id=0):
     if section_id:
@@ -153,14 +148,14 @@
             'name': section.name,
         }
         return render_to_response('web/delete_confirm.html', context, RequestContext(request))
-        
+
     elif request.GET.get('action', None) == 'delete_cancel':
         return HttpResponseRedirect(reverse(version_view, args=[topic_name, version_name]))
-        
+
     elif request.GET.get('action', None) == 'delete_confirm':
         section.delete()
         return HttpResponseRedirect(reverse(version_view, args=[topic_name, version_name]))
-        
+
     else:
         form = SectionForm(instance=section)
     context = {
@@ -182,7 +177,7 @@
     links = Link.objects.filter(rendered_element=namespace)
     questions = [link for link in links if link.link_type is LINK_QUESTION]
     tutorials = [link for link in links if link.link_type is LINK_TUTORIAL]
-    
+
     context = {
         'sidenav': topic_name,
         'topic': namespace.platform_section.topic_version.topic,
@@ -193,21 +188,7 @@
     }
     return render_to_response('web/namespace.html', context, RequestContext(request))
 
-class NamespaceForm(ModelForm):
-    class Meta:
-        model = Namespace
-        
-    def __init__(self, *args, **kargs):
-        if 'version' in kargs:
-            version = kargs['version']
-            del kargs['version']
-        elif hasattr(self, 'instance') and self.instance.section:
-            version = self.instance.section.topic_version
-        else:
-            version=None
-        super(NamespaceForm, self).__init__(*args, **kargs)
-        self.fields['platform_section'].queryset = Section.objects.filter(topic_version=version)
-                
+
 def namespace_edit(request, topic_name, version_name, namespace_id=0):
     if namespace_id:
         namespace = get_object_or_404(Namespace, platform_section__topic_version__slug=version_name, platform_section__topic_version__topic__slug=topic_name, id=namespace_id)
@@ -235,14 +216,14 @@
             'type': 'namespace',
         }
         return render_to_response('web/delete_confirm.html', context, RequestContext(request))
-        
+
     elif request.GET.get('action', None) == 'delete_cancel':
         return HttpResponseRedirect(reverse(element_view, args=[topic_name, version_name, namespace.name]))
-        
+
     elif request.GET.get('action', None) == 'delete_confirm':
         namespace.delete()
         return HttpResponseRedirect(reverse(version_view, args=[topic_name, version_name]))
-        
+
     else:
         form = NamespaceForm(instance=namespace, version=version)
     context = {
@@ -260,7 +241,7 @@
     links = Link.objects.filter(rendered_element=page)
     questions = [link for link in links if link.link_type is LINK_QUESTION]
     tutorials = [link for link in links if link.link_type is LINK_TUTORIAL]
-    
+
     context = {
         'sidenav': topic_name,
         'topic': page.section.topic_version.topic,
@@ -271,22 +252,7 @@
     }
     return render_to_response('web/page.html', context, RequestContext(request))
 
-class PageForm(ModelForm):
-    class Meta:
-        model = Page
-        
-    def __init__(self, *args, **kargs):
-        if 'version' in kargs:
-            version = kargs['version']
-            del kargs['version']
-        elif hasattr(self, 'instance') and self.instance.section:
-            version = self.instance.section.topic_version
-        else:
-            version=None
-        super(PageForm, self).__init__(*args, **kargs)
-        self.fields['section'].queryset = Section.objects.filter(topic_version=version)
-        self.fields['namespace'].queryset = Namespace.objects.filter(platform_section__topic_version=version)
-                
+
 def page_edit(request, topic_name, release_version, page_id=0):
     if page_id:
         page = get_object_or_404(Page, section__topic_version__slug=release_version, section__topic_version__topic__slug=topic_name, id=page_id)
@@ -315,7 +281,8 @@
         'page': page,
     }
     return render_to_response('web/page_edit.html', context, RequestContext(request))
-    
+
+
 def element_view(request, topic_name, release_version, element_fullname):
     try:
         element = Element.objects.get(section__topic_version__slug=release_version, section__topic_version__topic__slug=topic_name, fullname=element_fullname)
@@ -328,7 +295,7 @@
 
     questions = [link for link in links if link.link_type is LINK_QUESTION]
     tutorials = [link for link in links if link.link_type is LINK_TUTORIAL]
-    
+
     context = {
         'sidenav': topic_name,
         'topic': element.section.topic_version.topic,
@@ -340,22 +307,7 @@
     }
     return render_to_response('web/element.html', context, RequestContext(request))
 
-class ElementForm(ModelForm):
-    class Meta:
-        model = Element
-        
-    def __init__(self, *args, **kargs):
-        if 'version' in kargs:
-            version = kargs['version']
-            del kargs['version']
-        elif hasattr(self, 'instance') and self.instance.section:
-            version = self.instance.section.topic_version
-        else:
-            version=None
-        super(ElementForm, self).__init__(*args, **kargs)
-        self.fields['section'].queryset = Section.objects.filter(topic_version=version)
-        self.fields['namespace'].queryset = Namespace.objects.filter(platform_section__topic_version=version)
-                
+
 def element_edit(request, topic_name, release_version, element_id=0):
     if element_id:
         element = get_object_or_404(Element, section__topic_version__slug=release_version, section__topic_version__topic__slug=topic_name, id=element_id)
@@ -382,14 +334,14 @@
             'element': element,
         }
         return render_to_response('web/delete_confirm.html', context, RequestContext(request))
-        
+
     elif request.GET.get('action', None) == 'delete_cancel':
         return HttpResponseRedirect(reverse(element_view, args=[topic_name, release_version, element.fullname]))
-        
+
     elif request.GET.get('action', None) == 'delete_confirm':
         element.delete()
         return HttpResponseRedirect(reverse(version_view, args=[topic_name, release_version]))
-        
+
     else:
         form = ElementForm(instance=element, version=version)
     context = {
@@ -400,12 +352,13 @@
         'element': element,
     }
     return render_to_response('web/element_edit.html', context, RequestContext(request))
-    
+
+
 def search(request, topic_name, release_version):
     version = get_object_or_404(Version, topic__slug=topic_name, slug=release_version)
     query = request.GET.get('query', '')
     results = Element.objects.filter(section__topic_version=version, name__icontains=query).order_by('section', 'fullname')
-    
+
     context = {
         'sidenav': topic_name,
         'topic': version.topic,
@@ -415,15 +368,6 @@
     }
     return render_to_response('web/search.html', context, RequestContext(request))
 
-class TokenForm(ModelForm):
-    class Meta:
-        model = Token
-        fields = ('user',)
-
-class UserForm(ModelForm):
-    class Meta:
-        model = User
-        fields = ('username',)
 
 def token_edit(request, token_key=None):
     if token_key:
@@ -468,4 +412,3 @@
         'tokens': tokens,
     }
     return render_to_response('web/token_edit.html', context, RequestContext(request))
-