Projet

Général

Profil

0001-wcs-make-sure-the-wcs-URL-has-a-trailing-slash-7326.patch

Frédéric Péters, 21 mai 2015 11:24

Télécharger (2,54 ko)

Voir les différences: 

Subject: [PATCH] wcs: make sure the wcs URL has a trailing slash (#7326)


 combo/apps/wcs/models.py | 4 ++--
 combo/apps/wcs/utils.py  | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)
combo/apps/wcs/models.py
52 52 
        if self.formdef_reference:
53 53 
            wcs_key, form_slug = self.formdef_reference.split(':')
54 54 
            wcs_site = get_wcs_services().get(wcs_key)
55 
            forms_response_json = get_wcs_json(wcs_site.get('url') + 'json')
55 
            forms_response_json = get_wcs_json(wcs_site.get('url'), 'json')
56 56 
            for form in forms_response_json:
57 57 
                slug = form.get('slug')
58 58 
                if slug == form_slug:
......
93 93 
        if self.category_reference:
94 94 
            wcs_key, category_slug = self.category_reference.split(':')
95 95 
            wcs_site = get_wcs_services().get(wcs_key)
96 
            categories_response_json = get_wcs_json(wcs_site.get('url') + 'categories')
96 
            categories_response_json = get_wcs_json(wcs_site.get('url'), 'categories')
97 97 
            for category in categories_response_json.get('data'):
98 98 
                slug = category.get('slug')
99 99 
                if slug == category_slug:
combo/apps/wcs/utils.py
27 27 
        return {}
28 28 
    return settings.KNOWN_SERVICES.get('wcs')
29 29 

  		




  30
  
  
    
def get_wcs_json(url):

  		




  
  30
  
    
def get_wcs_json(wcs_url, path):

  		




  
  31
  
    
    if not wcs_url.endswith('/'):

  		




  
  32
  
    
        wcs_url += '/'

  		




  
  33
  
    
    url = wcs_url + path

  		




  31
  34
  
    
    response_json = cache.get(url)

  		




  32
  35
  
    
    if response_json is None:

  		




  33
  36
  
    
        response_json = requests.get(url, headers={'accept': 'application/json'}).json()

  		




  ......




  38
  41
  
    
    references = []

  		




  39
  42
  
    
    for wcs_key, wcs_site in get_wcs_services().iteritems():

  		




  40
  43
  
    
        site_title = wcs_site.get('title')

  		




  41
  
  
    
        response_json = get_wcs_json(wcs_site.get('url') + url)

  		




  
  44
  
    
        response_json = get_wcs_json(wcs_site.get('url'), url)

  		




  42
  45
  
    
        if type(response_json) is dict:

  		




  43
  46
  
    
            response_json = response_json.get('data')

  		




  44
  47
  
    
        for element in response_json:

  		




  45
  
  
    
-