Changeset 8507
- Timestamp:
- 10/08/12 15:32:06 (9 years ago)
- Location:
- mauRepo/MolesManager/trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/molesSessionMiddleware.py
r8486 r8507 42 42 from django.core.context_processors import csrf 43 43 from django.shortcuts import render_to_response 44 from cedaMoles import __version__ 44 45 45 46 … … 89 90 def process_response(self, request, response): 90 91 if hasattr(request, "moles3EPB"): 91 request.moles3EPB.close() 92 92 request.moles3EPB.close() 93 93 return response 94 94 … … 102 102 if runMigration and not MolesSessionMiddleware._migrationThread.isAlive(): 103 103 #t.setDaemon(False) 104 MolesSessionMiddleware._migrationThread.start() 104 MolesSessionMiddleware._migrationThread.start() 105 106 107 def mm_render_to_response(request, context, page_to_render): 108 """ 109 Exploit a 'render_to_response' action. The advantage of this method 110 is to contains a number of operations that are expected to be called 111 for each page rendering, for example passing the application version number 112 113 **Parameters** 114 * HttpRequest_ **request** 115 a django HttpRequest instance 116 * `dict` **context** 117 a dictionary where to pass parameter to the rendering function 118 * `string` **page_to_render** 119 the html page to render 120 """ 121 if context is None or not isinstance(context, dict): 122 raise Exception("Cannot render an empty context") 123 124 context['version'] = __version__ 125 context.update(csrf(request)) 126 return render_to_response(page_to_render, context) -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/static/templates/base.html
r8503 r8507 149 149 </div> <!-- End div footerLogos--> 150 150 <div class="grid_6 push_3 whiteFill omega" id="footerStatements"> 151 <p>Copyright © 2011 STFC | All Rights Reserved </p>151 <p>Copyright © 2011 STFC | All Rights Reserved - Version {{ version }} </p> 152 152 153 153 <p class="credits">Based on 960.gs with design elements from <a href="http://1234.info/" title="Designer Homepage">1234.info</a> | <a href="http://validator.w3.org/check?uri=referer" title="Validate XHTML code">XHTML 1.0</a> | <a href="http://jigsaw.w3.org/css-validator/" title="Validate CSS code">CSS 2.0</a> </p> -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaObservationView.py
r8486 r8507 36 36 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation 37 37 from cedaMoles.MolesManager.views.moles2gui import encodeCedaMoles2Json 38 from cedaMoles.MolesManager.molesSessionMiddleware import mm_render_to_response 38 39 39 40 … … 50 51 51 52 def _finalizeResponse(request, record): 52 c = {}53 context = {} 53 54 if record: 54 c ['coObs'] = encodeToJSON(record)55 context['coObs'] = encodeToJSON(record) 55 56 56 #c['new_coObs'] = encodeCedaMoles2Json(record)57 context['new_coObs'] = encodeCedaMoles2Json(record) 57 58 58 59 guid = request.moles3EPB.retrieveGUIDFromInstance(record) 59 60 if guid: 60 c['guid'] = guid.id 61 print c['guid'] 62 print c['coObs'] 63 64 c.update(csrf(request)) 65 return render_to_response('cedaObservation.html', c) 61 context['guid'] = guid.id 62 print context['guid'] 63 print context['coObs'] 64 65 return mm_render_to_response(request, 'cedaObservation.html', context) 66 66 67 67 def _getCedaObservation(request, obs_id): -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/cedaSearch.py
r8503 r8507 9 9 import cedaObservationView 10 10 import cedaObservationCollectionView 11 from cedaMoles.MolesManager.molesSessionMiddleware import mm_render_to_response 11 12 12 13 def getResponseByGuid(request, guid): … … 48 49 49 50 def coSearch(request): 50 c = {}51 context = {} 51 52 if 'searchTerm' in request.POST: 52 c ['searchResults'] = __doSearch(request, request.POST['searchTerm'])53 context['searchResults'] = __doSearch(request, request.POST['searchTerm']) 53 54 54 c .update(csrf(request))55 if c == {} :56 return render_to_response('cedaObservation.html', c )55 context.update(csrf(request)) 56 if context == {} : 57 return render_to_response('cedaObservation.html', context) 57 58 else : 58 59 found = False 59 60 try: 60 a = c ['searchResults']61 a = context['searchResults'] 61 62 found = True 62 63 except Exception, ex: 63 64 pass 64 65 if not found: 65 return render_to_response('cedaSearch.html', c)66 return render_to_response('cedaSearchResults.html', c)66 return mm_render_to_response(request, context, 'cedaSearch.html') 67 return mm_render_to_response(request, context, 'cedaSearchResults.html') -
mauRepo/MolesManager/trunk/cedaMoles/MolesManager/views/moles2gui/__init__.py
r8486 r8507 95 95 if type(cedaObject) in cls.acceptedTypes: 96 96 for item in cls.mapper.items(): 97 setattr(instance, item[0], getData(cedaObject, item[1])) 97 if item[0] == 'resultTime' and item[1] == 'resultTime': 98 print item[0] 99 try: 100 setattr(instance, item[0], getData(cedaObject, item[1])) 101 except Exception as e: 102 print e 98 103 99 104 @classmethod … … 146 151 setattr(adapter, '_adapter_module', adapter.__module__) 147 152 setattr(adapter, '_adapter_clazz', adapter.__class__.__name__) 148 149 153 cls._cedaObjToAdapterMapping(adapter, cedaObject) 150 154 adapter.postCedaObjToAdapterMapping(cedaObject) … … 318 322 encoder = dynamicallyLoadClass(module, clazz) 319 323 return encoder.cedaObjToAdapter(cedaObj) 324 320 325 321 326 # Then is a non mapped class -
mauRepo/MolesManager/trunk/docs/source/src/index.rst
r8476 r8507 2 2 Ceda Moles3 API 3 3 =============== 4 .. _HttpRequest: https://docs.djangoproject.com/en/dev/ref/request-response/#django.http.HttpRequest 4 5 5 6 .. toctree::
Note: See TracChangeset
for help on using the changeset viewer.