Browse Source

move general errors from errors[''] to errors['__all__']

Natenom/support-murmur-13-1446181288462
Michael Ziegler 14 years ago
parent
commit
d73b40b066
  1. 10
      pyweb/djextdirect.py
  2. 4
      pyweb/mumble/tests.py

10
pyweb/djextdirect.py

@ -75,8 +75,8 @@ Ext.extend( Ext.ux.%(clsname)s, Ext.form.FormPanel, {
params: Ext.applyIf( {pk: this.pk}, this.baseParams ),
failure: function( form, action ){
if( action.failureType == Ext.form.Action.SERVER_INVALID &&
typeof action.result.errors[''] != 'undefined' ){
Ext.Msg.alert( "Error", action.result.errors[''] );
typeof action.result.errors['__all__'] != 'undefined' ){
Ext.Msg.alert( "Error", action.result.errors['__all__'] );
}
}
});
@ -517,7 +517,7 @@ class Provider( object ):
if hasattr( forminst, "EXT_authorize" ) and \
forminst.EXT_authorize( request, "get" ) is False:
return { 'success': False, 'errors': {'': 'access denied'} }
return { 'success': False, 'errors': {'__all__': 'access denied'} }
data = {}
for fld in forminst.fields:
@ -541,12 +541,12 @@ class Provider( object ):
if hasattr( forminst, "EXT_authorize" ) and \
forminst.EXT_authorize( request, "update" ) is False:
return { 'success': False, 'errors': {'': 'access denied'} }
return { 'success': False, 'errors': {'__all__': 'access denied'} }
# save if either no usable validation method available or validation passes; and form.is_valid
if ( hasattr( forminst, "EXT_validate" ) and callable( forminst.EXT_validate )
and not forminst.EXT_validate( request ) ):
return { 'success': False, 'errors': {'': 'pre-validation failed'} }
return { 'success': False, 'errors': {'__all__': 'pre-validation failed'} }
if forminst.is_valid():
forminst.save()

4
pyweb/mumble/tests.py

@ -165,8 +165,8 @@ def generateTestCase( name, formname, data, login=None ):
return type( name, (ExtDirectFormTestMixin, TestCase), attrs )
RES_SUCCESS = {'success': True}
RES_ACCESSDENIED = {'success': False, 'errors': {'': 'access denied'}}
RES_PREVALFAIL = {'success': False, 'errors': {'': 'pre-validation failed'}}
RES_ACCESSDENIED = {'success': False, 'errors': {'__all__': 'access denied'}}
RES_PREVALFAIL = {'success': False, 'errors': {'__all__': 'pre-validation failed'}}
LOGIN_SUPERADMIN = {'username': 'svedrin', 'password': 'passwort'}
LOGIN_UNREGUSER = {'username': 'unreg', 'password': 'passwort'}

Loading…
Cancel
Save