Projet

Général

Profil

0001-misc-create-a-property-to-get-formdef-keywords-as-a-.patch

Frédéric Péters, 07 novembre 2015 14:07

Télécharger (1,79 ko)

Voir les différences: 

Subject: [PATCH] misc: create a property to get formdef keywords as a list
 (#8905)


 wcs/api.py     | 7 +------
 wcs/formdef.py | 6 ++++++
 2 files changed, 7 insertions(+), 6 deletions(-)
wcs/api.py
297 297 
                            continue
298 298 
                        authentication_required = True
299 299 

  		




  300
  
  
    
            if formdef.keywords:

  		




  301
  
  
    
                keywords = [x.strip() for x in formdef.keywords.split(',')]

  		




  302
  
  
    
            else:

  		




  303
  
  
    
                keywords = []

  		




  304
  
  
    

  		




  305
  300
  
    
            formdict = {'title': unicode(formdef.name, charset),

  		




  306
  301
  
    
                        'slug': formdef.url_name,

  		




  307
  302
  
    
                        'url': formdef.get_url(),

  		




  308
  303
  
    
                        'description': formdef.description or '',

  		




  309
  
  
    
                        'keywords': keywords,

  		




  
  304
  
    
                        'keywords': formdef.keywords_list,

  		




  310
  305
  
    
                        'authentication_required': authentication_required}

  		




  311
  306
  
    

  		




  312
  307
  
    
            formdict['redirection'] = bool(formdef.is_disabled() and

  		












  

    
      wcs/formdef.py
    
  





  327
  327
  
    
            self.workflow_id = None

  		




  328
  328
  
    
    workflow = property(get_workflow, set_workflow)

  		




  329
  329
  
    

  		




  
  330
  
    
    @property

  		




  
  331
  
    
    def keywords_list(self):

  		




  
  332
  
    
        if not self.keywords:

  		




  
  333
  
    
            return []

  		




  
  334
  
    
        return [x.strip() for x in self.keywords.split(',')]

  		




  
  335
  
    

  		




  330
  336
  
    
    def get_variable_options(self):

  		




  331
  337
  
    
        variables = {}

  		




  332
  338
  
    
        if not self.workflow.variables_formdef:

  		




  333
  
  
    
-