Projet

Général

Profil

0001-admin-redirect-to-anchored-field-after-submit-10759.patch

Frédéric Péters, 28 avril 2016 18:42

Télécharger (3,19 ko)

Voir les différences: 

Subject: [PATCH] admin: redirect to anchored field after submit (#10759)


 tests/test_admin_pages.py | 8 ++++----
 wcs/admin/fields.py       | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
tests/test_admin_pages.py
827 827 
    resp.forms[0]['label'] = 'changed field'
828 828 
    resp.forms[0]['required'] = False
829 829 
    resp = resp.forms[0].submit('submit')
830 
    assert resp.location == 'http://example.net/backoffice/forms/1/fields/'
830 
    assert resp.location == 'http://example.net/backoffice/forms/1/fields/#itemId_1'
831 831 

  		




  832
  832
  
    
    assert FormDef.get(1).fields[0].label == 'changed field'

  		




  833
  833
  
    
    assert FormDef.get(1).fields[0].required == False

  		




  ......




  859
  859
  
    
    resp.forms[0]['prefill$type'] = 'String'

  		




  860
  860
  
    
    resp.forms[0]['prefill$value_string'] = 'test'

  		




  861
  861
  
    
    resp = resp.forms[0].submit('submit')

  		




  862
  
  
    
    assert resp.location == 'http://example.net/backoffice/forms/1/fields/'

  		




  
  862
  
    
    assert resp.location == 'http://example.net/backoffice/forms/1/fields/#itemId_1'

  		




  863
  863
  
    
    resp = resp.follow()

  		




  864
  864
  
    

  		




  865
  865
  
    
    assert FormDef.get(formdef.id).fields[0].prefill == {'type': 'string', 'value': 'test'}

  		




  ......




  906
  906
  
    
    assert 'items$element1' in resp.form.fields

  		




  907
  907
  
    
    # but don't fill anything

  		




  908
  908
  
    
    resp = resp.forms[0].submit('submit')

  		




  909
  
  
    
    assert resp.location == 'http://example.net/backoffice/forms/1/fields/'

  		




  
  909
  
    
    assert resp.location == 'http://example.net/backoffice/forms/1/fields/#itemId_1'

  		




  910
  910
  
    
    resp = resp.follow()

  		




  911
  911
  
    

  		




  912
  912
  
    
    assert FormDef.get(1).fields[0].label == 'changed field'

  		




  ......




  918
  918
  
    
    assert resp.forms[0]['label'].value == 'changed field'

  		




  919
  919
  
    
    resp.forms[0]['items$element0'] = 'XXX'

  		




  920
  920
  
    
    resp = resp.forms[0].submit('submit')

  		




  921
  
  
    
    assert resp.location == 'http://example.net/backoffice/forms/1/fields/'

  		




  
  921
  
    
    assert resp.location == 'http://example.net/backoffice/forms/1/fields/#itemId_1'

  		




  922
  922
  
    
    assert FormDef.get(1).fields[0].items == ['XXX']

  		




  923
  923
  
    

  		




  924
  924
  
    
def test_form_edit_page_field(pub):

  		












  

    
      wcs/admin/fields.py
    
  





  62
  62
  
    
        redo = False

  		




  63
  63
  
    

  		




  64
  64
  
    
        if form.get_submit() == 'cancel':

  		




  65
  
  
    
            return redirect('..')

  		




  
  65
  
    
            return redirect('../#itemId_%s' % self.field.id)

  		




  66
  66
  
    

  		




  67
  67
  
    
        if form.get_widget('items') and form.get_widget('items').get_widget('add_element').parse():

  		




  68
  68
  
    
            form.clear_errors()

  		




  ......




  86
  86
  
    
            self.submit(form)

  		




  87
  87
  
    
            if form.get_widget('items') is None and self.field.type == 'item':

  		




  88
  88
  
    
                return redirect('.')

  		




  89
  
  
    
            return redirect('..')

  		




  
  89
  
    
            return redirect('../#itemId_%s' % self.field.id)

  		




  90
  90
  
    

  		




  91
  91
  
    
    def submit(self, form):

  		




  92
  92
  
    
        for f in self.field.get_admin_attributes():

  		




  93
  
  
    
-