Compare commits
8 Commits
issue-2274
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 2a88b488ab | |||
| 93ef108c0b | |||
| 382d034fdd | |||
| ee0763100b | |||
| 67b033d0a8 | |||
| b6060ab79a | |||
| 66ae2a5a7f | |||
| 2e8a8a62f9 |
+1
-1
Submodule gluon/packages/dal updated: e595b921b0...f74a107e00
+1
-1
Submodule gluon/packages/yatl updated: 468c093ab0...5deb403a9e
+7
-2
@@ -461,7 +461,12 @@ class RadioWidget(OptionsWidget):
|
|||||||
opts.append(child(tds))
|
opts.append(child(tds))
|
||||||
|
|
||||||
if opts:
|
if opts:
|
||||||
opts[-1][0][0]['hideerror'] = False
|
opts.append(
|
||||||
|
INPUT(requires=attr.get('requires', None),
|
||||||
|
_style="display:none;",
|
||||||
|
_disabled="disabled",
|
||||||
|
_name=field.name,
|
||||||
|
hideerror=False))
|
||||||
return parent(*opts, **attr)
|
return parent(*opts, **attr)
|
||||||
|
|
||||||
|
|
||||||
@@ -1814,7 +1819,7 @@ class SQLFORM(FORM):
|
|||||||
if not field.widget and field.type.startswith('list:') and \
|
if not field.widget and field.type.startswith('list:') and \
|
||||||
not OptionsWidget.has_options(field):
|
not OptionsWidget.has_options(field):
|
||||||
field.widget = self.widgets.list.widget
|
field.widget = self.widgets.list.widget
|
||||||
if field.widget and fieldname in request_vars:
|
if field.widget == self.widgets.list.widget and fieldname in request_vars:
|
||||||
if fieldname in self.request_vars:
|
if fieldname in self.request_vars:
|
||||||
value = self.request_vars[fieldname]
|
value = self.request_vars[fieldname]
|
||||||
elif self.record:
|
elif self.record:
|
||||||
|
|||||||
+2
-2
@@ -3726,7 +3726,7 @@ class Auth(AuthAPI):
|
|||||||
are passed to the constructor of class AuthJWT. Look there for documentation.
|
are passed to the constructor of class AuthJWT. Look there for documentation.
|
||||||
"""
|
"""
|
||||||
if not self.jwt_handler:
|
if not self.jwt_handler:
|
||||||
raise HTTP(400, "Not authorized")
|
raise HTTP(401, "Not authorized")
|
||||||
else:
|
else:
|
||||||
rtn = self.jwt_handler.jwt_token_manager()
|
rtn = self.jwt_handler.jwt_token_manager()
|
||||||
raise HTTP(200, rtn, cookies=None, **current.response.headers)
|
raise HTTP(200, rtn, cookies=None, **current.response.headers)
|
||||||
@@ -3820,7 +3820,7 @@ class Auth(AuthAPI):
|
|||||||
|
|
||||||
def allows_jwt(self, otherwise=None):
|
def allows_jwt(self, otherwise=None):
|
||||||
if not self.jwt_handler:
|
if not self.jwt_handler:
|
||||||
raise HTTP(400, "Not authorized")
|
raise HTTP(401, "Not authorized")
|
||||||
else:
|
else:
|
||||||
return self.jwt_handler.allows_jwt(otherwise=otherwise)
|
return self.jwt_handler.allows_jwt(otherwise=otherwise)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user