Commit759caa6

authored

Merge pull request#38 from zhangchunlin/master

Sync

2 parentsb4e35fc +4d5dacd commit759caa6Copy full SHA for 759caa6

File tree

-5

lines changed

-5

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`	`#coding=utf-8`
`2`	`2`
`3`		`-fromuliwebimportsettings,models,request,functions`
	`3`	`+fromuliwebimportsettings,models,request,functions,UliwebError`
`4`	`4`	`fromuliweb.ormimportModelNotFound`
	`5`	`+importlogging`
`5`	`6`
	`7`	`+log=logging.getLogger('apijson')`
`6`	`8`
`7`	`9`	`defget_apijson_tables(role="UNKNOWN"):`
`8`	`10`	`fromuliwebimportsettings`
`@@ -82,7 +84,7 @@ def __init__(self,name,params,parent,key):`
`82`	`84`	`def_check_GET_permission(self):`
`83`	`85`	`GET=self.setting.get("GET")`
`84`	`86`	`ifnotGET:`
`85`		`-raiseUliwebError("'%s' not accessible by apijson"%(name))`
	`87`	`+raiseUliwebError("'%s' not accessible by apijson"%(self.name))`
`86`	`88`
`87`	`89`	`roles=GET.get("roles")`
`88`	`90`	`params_role=self.params.get("@role")`
`@@ -93,7 +95,7 @@ def _check_GET_permission(self):`
`93`	`95`	`else:`
`94`	`96`	`params_role="UNKNOWN"`
`95`	`97`	`ifparams_rolenotinroles:`
`96`		`-raiseUliwebError("'%s' not accessible by role '%s'"%(model_name,params_role))`
	`98`	`+raiseUliwebError("'%s' not accessible by role '%s'"%(self.name,params_role))`
`97`	`99`	`ifparams_role=="UNKNOWN":`
`98`	`100`	`self.permission_check_ok=True`
`99`	`101`	`eliffunctions.has_role(request.user,params_role):`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#coding=utf-8`
`2`	`2`	`fromuliwebimportexpose,functions,models,UliwebError`
`3`	`3`	`fromuliweb.ormimportModelNotFound`
	`4`	`+fromuliweb.utils._compatimportstring_types`
`4`	`5`	`fromsqlalchemy.sqlimportand_,or_,not_`
`5`	`6`	`fromjsonimportloads`
`6`	`7`	`fromcollectionsimportOrderedDict`
`@@ -109,7 +110,7 @@ def _get_one(self,key):`
`109`	`110`	`roles=GET.get("roles")`
`110`	`111`	`permission_check_ok=False`
`111`	`112`	`ifnotparams_role:`
`112`		`-ifrequest.user:`
	`113`	`+ifhasattr(request,"user"):`
`113`	`114`	`params_role="LOGIN"`
`114`	`115`	`else:`
`115`	`116`	`params_role="UNKNOWN"`
`@@ -224,7 +225,7 @@ def _get_filter_condition(self,model,model_param,item,expr=False):`
`224`	`225`	`returnself._expr(model,model_param,model_expr=item)`
`225`	`226`	`else:`
`226`	`227`	`raiseUliwebError("item can be array only in @expr: '%s'"%(item))`
`227`		`-ifnotisinstance(item,str):`
	`228`	`+ifnotisinstance(item,string_types):`
`228`	`229`	`raiseUliwebError("item should be array or string: '%s'"%(item))`
`229`	`230`	`n=item`
`230`	`231`	`ifn[0]=="@":`

Comments

(0)