Projet

Général

Profil

0001-general-rename-Variable-Name-to-Identifier-15125.patch

Frédéric Péters, 19 juin 2017 10:01

Télécharger (5,18 ko)

Voir les différences: 

Subject: [PATCH] general: rename "Variable Name" to "Identifier" (#15125)

This also adds specific hints on the place it is used.

 wcs/fields.py             | 5 +++--
 wcs/wf/attachment.py      | 3 ++-
 wcs/wf/export_to_model.py | 3 ++-
 wcs/wf/form.py            | 3 ++-
 wcs/wf/wscall.py          | 3 ++-
 wcs/workflows.py          | 4 ++--
 6 files changed, 13 insertions(+), 8 deletions(-)
wcs/fields.py
394 394 
                required = True, size = 50)
395 395 
        form.add(CheckboxWidget, 'required', title = _('Required'),
396 396 
                value = self.required)
397 
        form.add(VarnameWidget, 'varname', title=_('Variable Name'),
398 
                value=self.varname, size=30, advanced=(not self.varname))
397 
        form.add(VarnameWidget, 'varname', title=_('Identifier'),
398 
                value=self.varname, size=30, advanced=(not self.varname),
399 
                hint=_('This is used as suffix for variable names.'))
399 400 
        form.add(TextWidget, 'hint', title = _('Hint'), value = self.hint,
400 401 
                cols=60, rows=3)
401 402 
        form.add(CheckboxWidget, 'in_listing', title = _('Display in listings'),
wcs/wf/attachment.py
153 153 
                     value=self.backoffice_info_text)
154 154 
        if 'varname' in parameters:
155 155 
            form.add(VarnameWidget, '%svarname' % prefix,
156 
                     title=_('Variable Name'), value=self.varname)
156 
                     title=_('Identifier'), value=self.varname,
157 
                     hint=_('This is used to get attachment in expressions.'))
157 158 
        if 'push_to_portfolio' in parameters:
158 159 
            form.add(CheckboxWidget, '%spush_to_portfolio' % prefix,
159 160 
                     title=_('Push generated file to portfolio'),
wcs/wf/export_to_model.py
322 322 
                     value=self.push_to_portfolio)
323 323 
        if 'varname' in parameters:
324 324 
            form.add(VarnameWidget, '%svarname' % prefix,
325 
                     title=_('Variable Name'), value=self.varname)
325 
                     title=_('Identifier'), value=self.varname,
326 
                     hint=_('This is used to get generated document in expressions.'))
326 327 

  		




  327
  328
  
    
        if 'method' in parameters:

  		




  328
  329
  
    
            form.add(RadiobuttonsWidget, '%smethod' % prefix,

  		












  

    
      wcs/wf/form.py
    
  





  105
  105
  
    
                     value=self.backoffice_info_text)

  		




  106
  106
  
    
        if 'varname' in parameters:

  		




  107
  107
  
    
            form.add(VarnameWidget, '%svarname' % prefix, required=True,

  		




  108
  
  
    
                     title=_('Variable Name'), value=self.varname)

  		




  
  108
  
    
                     title=_('Identifier'), value=self.varname,

  		




  
  109
  
    
                     hint=_('This is used as prefix for form fields variable names.'))

  		




  109
  110
  
    

  		




  110
  111
  
    
            form.widgets.append(HtmlWidget(htmltext('<p><a href="fields/">%s</a></p>') % _('Edit Fields')))

  		




  111
  112
  
    

  		












  

    
      wcs/wf/wscall.py
    
  





  202
  202
  
    
                    attrs={'data-dynamic-display-parent': 'true'})

  		




  203
  203
  
    
        if 'varname' in parameters:

  		




  204
  204
  
    
            form.add(VarnameWidget, '%svarname' % prefix,

  		




  205
  
  
    
                     title=_('Variable Name'), value=self.varname)

  		




  
  205
  
    
                     title=_('Identifier'), value=self.varname,

  		




  
  206
  
    
                     hint=_('This is used as prefix for webservice result variable names.'))

  		




  206
  207
  
    

  		




  207
  208
  
    
        form.widgets.append(HtmlWidget(htmltext('<h3>%s</h3>') % _('Error Handling')))

  		




  208
  209
  
    
        error_actions = [(':stop', _('Stop')), (':pass', _('Ignore'))]

  		












  

    
      wcs/workflows.py
    
  





  1853
  1853
  
    
                                'options': [(None, '---', None)] + self.get_list_of_roles()})

  		




  1854
  1854
  
    
        if 'varname' in parameters:

  		




  1855
  1855
  
    
            form.add(VarnameWidget, '%svarname' % prefix,

  		




  1856
  
  
    
                     title=_('Variable Name'), value=self.varname,

  		




  1857
  
  
    
                     hint=_('This will make the comment available in a variable named comment_varname.'))

  		




  
  1856
  
    
                     title=_('Identifier'), value=self.varname,

  		




  
  1857
  
    
                     hint=_('This will make the comment available in a variable named comment_ + identifier.'))

  		




  1858
  1858
  
    
        if 'backoffice_info_text' in parameters:

  		




  1859
  1859
  
    
            form.add(WysiwygTextWidget, '%sbackoffice_info_text' % prefix,

  		




  1860
  1860
  
    
                     title=_('Information Text for Backoffice'),

  		




  1861
  
  
    
-