Changeset 190

Timestamp:

02/09/10 13:54:02 (3 years ago)

Author:

luciano.ramalho

Message:

added linebreaks formatting to trial html dump view

Location:

trunk/clinicaltrials/registry

Files:

• models.py (modified) (3 diffs)
• views.py (modified) (2 diffs)

trunk/clinicaltrials/registry/models.py

@@ -3 +3 @@
 
 from django.utils.translation import ugettext_lazy as _
+from django.utils.html import linebreaks
 
 from datetime import datetime
@@ -41 +42 @@
             if field.rel and hasattr(value, 'html_dump'):
                 content = '<table>%s</table>' % value.html_dump(seen)
-            else:    
+            else:
                 content = unicode(value)
+                if u'\n' in content:
+                    content = linebreaks(content)
             html.append('<tr><th>%s</th><td>%s</td></tr>' % (field.name, content))
         for field_name in dir(self):
@@ -59 +62 @@
                         #else:    
                         content = unicode(rel_value)
+                        if u'\n' in content:
+                            content = linebreaks(content)
                         inner_html.append('<tr><th>%s</th><td>%s</td></tr>' % (id, content))
                     content = '<table>%s</table>' % '\n\t'.join(inner_html)

trunk/clinicaltrials/registry/views.py

@@ -24 +24 @@
 
 EXTRA_FORMS = 2
-TRIAL_FORMS = ['Trial Identification Form',
-               'Sponsors Form',
-               'Health Conditions Form',
-               'Interventions Form',
-               'Recruitment Form',
-               'Study Type Form',
-               'Outcomes Form',
-               'Descriptor Form']
+TRIAL_FORMS = ['Trial Identification',
+               'Sponsors',
+               'Health Conditions',
+               'Interventions',
+               'Recruitment',
+               'Study Type',
+               'Outcomes',
+               'Contacts']
 
 
@@ -65 +65 @@
     return HttpResponse(t.render(c))
 
-
 @login_required
 def step_1(request, trial_pk):