Changeset 8241 for mauRepo

Timestamp:

15/04/12 20:36:58 (8 years ago)

Author:

spascoe

Message:

Made all search boxes do the same thing. See NOTES.org for details of this and other recent changes.

Location:

mauRepo/MolesManager/trunk

Files:

• NOTES.org (added)
• src/MolesManager/settings_local.py (added)
• src/MolesManager/static/templates/base.html (modified) (2 diffs)
• src/MolesManager/views/cedaSearch.py (modified) (3 diffs)
• src/MolesManager/views/index.py (modified) (2 diffs)

mauRepo/MolesManager/trunk/src/MolesManager/static/templates/base.html

@@ -78 +78 @@
                                         <input type="hidden" name="coObs" id="coObs_id" value='{{ coObs }}' />
 
-                                        <div data-dojo-type="dijit.form.Form" id="myForm" data-dojo-id="myForm" encType="multipart/form-data" action="." method="POST">
+                                        <div
+                                        data-dojo-type="dijit.form.Form"
+                                        id="myForm"
+                                        data-dojo-id="myForm"
+                                        encType="multipart/form-data"
+                                        action="{% url MolesManager.views.cedaSearch.coSearch %}" method="POST">
         
                                         <script type="dojo/method" data-dojo-event="onSubmit">
@@ -94 +99 @@
                                                 <div class="fieldWrapper claro">
                                                         <label for="id_obj_id">Search:</label>
-                                                        <input type="text" name="obs_id" value= ""
+                                                        <input type="text" name="searchTerm" value= ""
                                                                 data-dojo-type="dijit.form.TextBox"
-                                                                data-dojo-props="trim:true, propercase:true" id="obs_id"/>
-                                                        <button id="search_obs" type="submit">Search</button>
+                                                                data-dojo-props="trim:true, propercase:true" id="searchTerm"/>
+                                                        <button id="search" type="submit">Search</button>
                                                 
                                                 </div> <!-- End of div fieldWrapper -->

mauRepo/MolesManager/trunk/src/MolesManager/views/cedaSearch.py

@@ -4 +4 @@
 @author: mnagni
 '''
-from django.shortcuts import render_to_response
+from django.shortcuts import render_to_response, redirect
 from django.core.context_processors import csrf
 from MolesManager.forms.commons import ObjectById
@@ -10 +10 @@
 from MolesManager.moles3epb import Moles3EPB
 from MolesManager.djencoder import DJEncoder
+
+from MolesManager.views import cedaObservationView
+from MolesManager.ceda_guid import CedaGUID
+from MolesManager.moles3epb import Moles3EPB
+
+
+
+def __getResponseByGuid(request, guid):
+    ceda_guid = Moles3EPB.search(CedaGUID, guid, request.moles_session)
+    if ceda_guid and ceda_guid.ceda_observation:
+        return redirect(cedaObservationView.coView, ceda_guid.ceda_observation)
 
 
@@ -27 +38 @@
 
 def coSearch(request):
-    c = {}
-    __getSample(request, c)
-    if c.has_key('records'):
-        c.update(csrf(request))
-    c.update(csrf(request))   
-    return render_to_response('cedaSearch.html', c)
+    if 'searchTerm' in request.POST:
+        return __getResponseByGuid(request, request.POST['searchTerm'])
+    else:
+        c = {}            
+        c.update(csrf(request))   
+        return render_to_response('cedaSearch.html', c)

mauRepo/MolesManager/trunk/src/MolesManager/views/index.py

@@ -8 +8 @@
 from django.shortcuts import render_to_response
 import MolesManager.settings as settings
+from django.core.context_processors import csrf
+
 import os
 
@@ -15 +17 @@
 
 def home(request):
-    return render_to_response('index.html',
-               #               {'MEDIA_URL':settings.MEDIA_URL, 
-               #                'STATIC_URL':settings.STATIC_URL,
-               #                }
-                              )
+    c = {}
+    c.update(csrf(request))
+    return render_to_response('index.html', c)