Ignore:
Timestamp:
26/03/08 09:35:55 (12 years ago)
Author:
cbyrom
Message:

Adjust check for '...loading' label - since this now includes the delete icon +
fix csml_api indent error.

Location:
TI05-delivery/ows_framework/trunk/ows_server/ows_server
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/csml_api.py

    r3536 r3678  
    2323            return render('csml_describe') 
    2424        else: 
    25                 response.headers['Content-Type'] = 'text/xml' 
    26             return response.write(ET.tostring(c.dataset.toXML())) 
     25            response.headers['Content-Type'] = 'text/xml' 
     26            response.write(ET.tostring(c.dataset.toXML())) 
     27            return response 
    2728     
    2829    def getFeature(self, file, feature, format): 
     
    3435        else: 
    3536            r = ET.Element("CSML_API"); f.toXML(r) 
    36                 response.headers['Content-Type'] = format 
    37             return response.write(ET.tostring(r)) 
     37            response.headers['Content-Type'] = format 
     38            response.write(ET.tostring(r)) 
     39            return response 
    3840 
    3941    def subsetToGridSeries(self, file, feature): 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/public/js/wmscControl.js

    r3649 r3678  
    299299                { 
    300300                        // check this isn't the 'loading...' leaf; escape if it is 
    301                         if (node.label == "...loading") 
     301                        if (node.label.indexOf("...loading") > -1) 
    302302                                return; 
    303303                                 
Note: See TracChangeset for help on using the changeset viewer.