Changeset 4432

Timestamp:

17/11/08 17:30:42 (12 years ago)

Author:

cbyrom

Message:

Add inputs checking to avoid unecessary errors being thrown when revisiting
page in wrong state - instead redirect back to home page.

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• controllers/listatom.py (modified) (1 diff)
• templates/atom_home.html (modified) (1 diff)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/listatom.py

@@ -75 +75 @@
                 c.searchData = searchData
                 self.__setup()
-                atomTypeID = inputs.get('atomTypeID').split('--')[1]
-                providerID = inputs.get('providerID').split('--')[1]
+                atomTypeID = inputs.get('atomTypeID')
+                providerID = inputs.get('providerID')
+                # NB, avoid page being reloaded in incorrect state - e.g. after
+                # browser reload
+                if not (atomTypeID and providerID):
+                    return self.atomHome()
+                    
+                atomTypeID = atomTypeID.split('--')[1]
+                providerID = providerID.split('--')[1]
                 c.results = self.searchAtoms(providerID, atomTypeID, inputs.get('title'))
                 

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/atom_home.html

@@ -20 +20 @@
                                 </h2>
                             <h2>
-                            <a href="${h.url_for(controller='listatom',action='list')}">Edit/List atoms</a>
+                            <a href="${h.url_for(controller='listatom',action='list', searchData=None)}">Edit/List atoms</a>
                             </h2>
                             <h2>