Changeset 613

Timestamp:

09/13/10 18:17:58 (3 years ago)

Author:

rafael.soares

Message:

fixed the site-description flatpage to work with flatepages_polyglot, refs #180

Location:

trunk/opentrials

Files:

• flatpages_polyglot/admin.py (modified) (1 diff)
• reviewapp/views.py (modified) (2 diffs)

trunk/opentrials/flatpages_polyglot/admin.py

@@ -18 +18 @@
         self.fields.keyOrder = ['flatpage','language','title','content']
 
-        if self.instance:
+        if self.instance and hasattr(self.instance.content_object, 'pk'):
             self.fields['flatpage'].initial = self.instance.content_object.pk
 

trunk/opentrials/reviewapp/views.py

@@ -17 +17 @@
 from django.contrib.sites.models import Site
 from django.contrib.flatpages.models import FlatPage
+from flatpages_polyglot.models import FlatPageTranslation
 from tickets.models import Ticket
 
@@ -42 +43 @@
     pages = FlatPage.objects.filter(url='/site-description/')
     if len(pages) < 1:
-        page = None
+        trans = None
     else:
         page = pages[0]
+        try:
+            trans = page.translations.get(language__iexact=request.LANGUAGE_CODE)
+
+            trans.registration_required = page.registration_required
+            trans.template_name = page.template_name
+        except FlatPageTranslation.DoesNotExist:
+            trans = page
 
     return render_to_response('reviewapp/index.html', {
-                              'clinical_trials': clinical_trials,
-                              'news': latest,
-                              'page': page,},
-                              context_instance=RequestContext(request))
+                          'clinical_trials': clinical_trials,
+                          'news': latest,
+                          'page': trans,},
+                          context_instance=RequestContext(request))
 
 @login_required