Skip to content

Sync #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TommyLemon merged 4 commits into from
Oct 9, 2019
Merged

Sync #38

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e996030
fix https://github.com/zhangchunlin/uliweb-apijson/issues/4 :"NameEr…
zhangchunlin Oct 9, 2019
f393e0e
fix py2/3 compatible, request by vaneoooo
zhangchunlin Oct 9, 2019
7de5728
fix "NameError: name 'log' is not defined"
zhangchunlin Oct 9, 2019
4d5dacd
fix "AttributeError: 'Request' object has no attribute 'user'"
zhangchunlin Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix py2/3 compatible, request by vaneoooo
  • Loading branch information
@zhangchunlin
zhangchunlin committed Oct 9, 2019
commit f393e0eb174b97bab6b65a049b73a672bd6c8a46
3 changes: 2 additions & 1 deletion uliweb_apijson/apijson/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#coding=utf-8
from uliweb import expose, functions, models, UliwebError
from uliweb.orm import ModelNotFound
from uliweb.utils._compat import string_types
from sqlalchemy.sql import and_, or_, not_
from json import loads
from collections import OrderedDict
Expand Down Expand Up @@ -224,7 +225,7 @@ def _get_filter_condition(self,model,model_param,item,expr=False):
return self._expr(model,model_param,model_expr=item)
else:
raise UliwebError("item can be array only in @expr: '%s'"%(item))
if not isinstance(item,str):
if not isinstance(item,string_types):
raise UliwebError("item should be array or string: '%s'"%(item))
n = item
if n[0]=="@":
Expand Down