Changeset 711

Timestamp:

11/25/10 09:18:48 (3 years ago)

Author:

jose.brandao

Message:

Changing to make possible find published trials by trial_id

Location:

trunk/opentrials

Files:

• repository/templates/repository/clinicaltrial_list.html (modified) (1 diff)
• repository/views.py (modified) (2 diffs)
• reviewapp/templates/reviewapp/index.html (modified) (1 diff)
• reviewapp/views.py (modified) (1 diff)

trunk/opentrials/repository/templates/repository/clinicaltrial_list.html

@@ -18 +18 @@
                 <td class="trial_label" width="50%">{% trans 'Title' %}</td>
                 <td class="trial_label" width="30%">{% trans 'Primary Id Number' %}</td>
-                <td class="trial_content" width="20%"><a href="{% url repository.trial_registered ct.hash_code %}">{{ ct.trial_id }}</a></td>
+                <td class="trial_content" width="20%"><a href="{% url repository.trial_registered ct.trial_id %}">{{ ct.trial_id }}</a></td>
             </tr>
             <tr>
-                <td class="trial_title" rowspan="2"><a href="{% url repository.trial_registered ct.hash_code %}">{{ ct.main_title }}</a></td>
+                <td class="trial_title" rowspan="2"><a href="{% url repository.trial_registered ct.trial_id %}">{{ ct.main_title }}</a></td>
                 <td class="trial_label">{% trans 'Recruitment Status' %}</td>
                 <td class="trial_content">{{ ct.rec_status }}</td>

trunk/opentrials/repository/views.py

@@ -2 +2 @@
 
 from django.core import serializers
-from django.http import HttpResponseRedirect, HttpResponse
+from django.http import HttpResponseRedirect, HttpResponse, Http404
 from django.shortcuts import render_to_response, get_object_or_404
 from django.utils.translation import ugettext_lazy as _
@@ -307 +307 @@
 def trial_registered(request, trial_fossil_id):
     ''' show details of a trial registered '''
-    fossil = get_object_or_404(Fossil, pk=trial_fossil_id)
+    try:
+        fossil = Fossil.objects.get(pk=trial_fossil_id)
+    except Fossil.DoesNotExist:
+        try:
+            fossil = Fossil.objects.get(is_most_recent=True, serialized__contains='"trial_id": "%s"'%trial_fossil_id)
+        except Fossil.DoesNotExist:
+            raise Http404
 
     ct = fossil.get_object_fossil()

trunk/opentrials/reviewapp/templates/reviewapp/index.html

@@ -54 +54 @@
         {% for ct in clinical_trials %}
             <li>
-                <a class="NewsTitle" href="{% url repository.trial_registered ct.hash_code %}">{{ ct.short_title }}</a>
+                <a class="NewsTitle" href="{% url repository.trial_registered ct.trial_id %}">{{ ct.short_title }}</a>
                 <p>
-                    <b>{% trans 'Primary Id Number' %}</b>: <a class="pnumber" href="{% url repository.trial_registered ct.hash_code %}">{{ ct.trial_id }}</a><br/>
+                    <b>{% trans 'Primary Id Number' %}</b>: <a class="pnumber" href="{% url repository.trial_registered ct.trial_id %}">{{ ct.trial_id }}</a><br/>
                 </p>
             </li>

trunk/opentrials/reviewapp/views.py

@@ -76 +76 @@
         show_beta_message = False
         
-    fossil_trials = ClinicalTrial.fossils.order_by('-creation')[:3]
+    fossil_trials = ClinicalTrial.fossils.published().order_by('-creation')[:3]
     clinical_trials = fossil_trials.proxies()
-    
-    """
-    for trial in clinical_trials:
-        try:
-            #trans = trial.translations.get(language__iexact=request.LANGUAGE_CODE)
-            trans = ClinicalTrialTranslation.objects.get_translation_for_object(
-                        request.LANGUAGE_CODE.lower(), trial,
-                        )
-        except ClinicalTrialTranslation.DoesNotExist:
-            trans = None
-        
-        if trans:
-            if trans.public_title:
-                trial.public_title = trans.public_title
-            if trans.public_title:
-                trial.scientific_title = trans.scientific_title
-    """
 
     return render_to_response('reviewapp/index.html', {