Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 4a5e758

Browse files
modelname -> model_name
1 parent 0437e9d commit 4a5e758

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

‎uliweb_apijson/apijson/views.py‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,22 @@ def get(self):
5050
return json(self.rdict)
5151

5252
def _get_one(self,key):
53-
modelname = key
53+
model_name = key
5454
params = self.request_data[key]
5555
params_role = params.get("@role")
5656

5757
try:
58-
model = getattr(models,modelname)
59-
model_setting = settings.APIJSON_MODELS.get(modelname,{})
58+
model = getattr(models,model_name)
59+
model_setting = settings.APIJSON_MODELS.get(model_name,{})
6060
except ModelNotFound as e:
61-
log.error("try to find model '%s' but not found: '%s'"%(modelname,e))
62-
return json({"code":400,"msg":"model '%s' not found"%(modelname)})
61+
log.error("try to find model '%s' but not found: '%s'"%(model_name,e))
62+
return json({"code":400,"msg":"model '%s' not found"%(model_name)})
6363
model_column_set = None
6464
q = model.all()
6565

6666
GET = model_setting.get("GET")
6767
if not GET:
68-
return json({"code":400,"msg":"'%s' not accessible"%(modelname)})
68+
return json({"code":400,"msg":"'%s' not accessible"%(model_name)})
6969

7070
roles = GET.get("roles")
7171
permission_check_ok = False
@@ -75,7 +75,7 @@ def _get_one(self,key):
7575
else:
7676
params_role = "UNKNOWN"
7777
if params_role not in roles:
78-
return json({"code":400,"msg":"'%s' not accessible by role '%s'"%(modelname,params_role)})
78+
return json({"code":400,"msg":"'%s' not accessible by role '%s'"%(model_name,params_role)})
7979
if params_role == "UNKNOWN":
8080
permission_check_ok = True
8181
elif functions.has_role(request.user,params_role):
@@ -88,7 +88,7 @@ def _get_one(self,key):
8888
if params_role=="OWNER":
8989
owner_filtered,q = self._filter_owner(model,model_setting,q)
9090
if not owner_filtered:
91-
return json({"code":400,"msg":"'%s' cannot filter with owner"%(modelname)})
91+
return json({"code":400,"msg":"'%s' cannot filter with owner"%(model_name)})
9292

9393
params = self.request_data[key]
9494
if isinstance(params,dict):
@@ -99,7 +99,7 @@ def _get_one(self,key):
9999
elif hasattr(model,n):
100100
q = q.filter(getattr(model.c,n)==params[n])
101101
else:
102-
return json({"code":400,"msg":"'%s' have no attribute '%s'"%(modelname,n)})
102+
return json({"code":400,"msg":"'%s' have no attribute '%s'"%(model_name,n)})
103103
o = q.one()
104104
if o:
105105
o = o.to_dict()
@@ -116,7 +116,7 @@ def _get_one(self,key):
116116

117117
def _get_array(self,key):
118118
params = self.request_data[key]
119-
modelname = None
119+
model_name = None
120120
model_param = None
121121
model_column_set = None
122122

@@ -147,14 +147,14 @@ def _get_array(self,key):
147147
for n in params:
148148
if n[0]!="@":
149149
# TODO: support join in the future, now only support 1 model
150-
modelname = n
150+
model_name = n
151151
break
152152

153-
if not modelname:
153+
if not model_name:
154154
return json({"code":400,"msg":"no model found in array query"})
155155

156156
#model settings
157-
model_setting = settings.APIJSON_MODELS.get(modelname,{})
157+
model_setting = settings.APIJSON_MODELS.get(model_name,{})
158158
secret_fields = model_setting.get("secret_fields")
159159

160160
#model params
@@ -164,18 +164,18 @@ def _get_array(self,key):
164164
if model_column:
165165
model_column_set = set(model_column.split(","))
166166
try:
167-
model = getattr(models,modelname)
167+
model = getattr(models,model_name)
168168
except ModelNotFound as e:
169-
log.error("try to find model '%s' but not found: '%s'"%(modelname,e))
170-
return json({"code":400,"msg":"model '%s' not found"%(modelname)})
169+
log.error("try to find model '%s' but not found: '%s'"%(model_name,e))
170+
return json({"code":400,"msg":"model '%s' not found"%(model_name)})
171171
#order
172172
model_order = model_param.get("@order")
173173

174174
q = model.all()
175175

176176
GET = model_setting.get("GET")
177177
if not GET:
178-
return json({"code":400,"msg":"'%s' not accessible by apijson"%(modelname)})
178+
return json({"code":400,"msg":"'%s' not accessible by apijson"%(model_name)})
179179

180180
roles = GET.get("roles")
181181
params_role = model_param.get("@role")
@@ -186,7 +186,7 @@ def _get_array(self,key):
186186
else:
187187
params_role = "UNKNOWN"
188188
if params_role not in roles:
189-
return json({"code":400,"msg":"'%s' not accessible by role '%s'"%(modelname,params_role)})
189+
return json({"code":400,"msg":"'%s' not accessible by role '%s'"%(model_name,params_role)})
190190
if params_role == "UNKNOWN":
191191
permission_check_ok = True
192192
elif functions.has_role(request.user,params_role):
@@ -200,7 +200,7 @@ def _get_array(self,key):
200200
if params_role == "OWNER":
201201
owner_filtered,q = self._filter_owner(model,model_setting,q)
202202
if not owner_filtered:
203-
return json({"code":400,"msg":"'%s' cannot filter with owner"%(modelname)})
203+
return json({"code":400,"msg":"'%s' cannot filter with owner"%(model_name)})
204204

205205
for n in model_param:
206206
if n[0]!="@":
@@ -209,7 +209,7 @@ def _get_array(self,key):
209209
if hasattr(model,name):
210210
q = q.filter(getattr(model.c,name).like(model_param[n]))
211211
else:
212-
return json({"code":400,"msg":"'%s' does not have '%s'"%(modelname,name)})
212+
return json({"code":400,"msg":"'%s' does not have '%s'"%(model_name,name)})
213213
elif n[-1]=="}" and n[-2]=="{":
214214
name = n[:-2]
215215
if hasattr(model,name):
@@ -280,22 +280,22 @@ def head(self):
280280
return json(self.rdict)
281281

282282
def _head(self,key):
283-
modelname = key
283+
model_name = key
284284
params = self.request_data[key]
285285
params_role = params.get("@role")
286286

287287
try:
288-
model = getattr(models,modelname)
289-
model_setting = settings.APIJSON_MODELS.get(modelname,{})
288+
model = getattr(models,model_name)
289+
model_setting = settings.APIJSON_MODELS.get(model_name,{})
290290
except ModelNotFound as e:
291-
log.error("try to find model '%s' but not found: '%s'"%(modelname,e))
292-
return json({"code":400,"msg":"model '%s' not found"%(modelname)})
291+
log.error("try to find model '%s' but not found: '%s'"%(model_name,e))
292+
return json({"code":400,"msg":"model '%s' not found"%(model_name)})
293293

294294
q = model.all()
295295

296296
HEAD = model_setting.get("HEAD")
297297
if not HEAD:
298-
return json({"code":400,"msg":"'%s' not accessible"%(modelname)})
298+
return json({"code":400,"msg":"'%s' not accessible"%(model_name)})
299299

300300
roles = HEAD.get("roles")
301301
permission_check_ok = False
@@ -305,7 +305,7 @@ def _head(self,key):
305305
else:
306306
params_role = "UNKNOWN"
307307
if params_role not in roles:
308-
return json({"code":400,"msg":"'%s' not accessible by role '%s'"%(modelname,params_role)})
308+
return json({"code":400,"msg":"'%s' not accessible by role '%s'"%(model_name,params_role)})
309309
if params_role == "UNKNOWN":
310310
permission_check_ok = True
311311
elif functions.has_role(request.user,params_role):
@@ -318,14 +318,14 @@ def _head(self,key):
318318
if params_role=="OWNER":
319319
owner_filtered,q = self._filter_owner(model,model_setting,q)
320320
if not owner_filtered:
321-
return json({"code":400,"msg":"'%s' cannot filter with owner"%(modelname)})
321+
return json({"code":400,"msg":"'%s' cannot filter with owner"%(model_name)})
322322
for n in params:
323323
if n[0]=="@":
324324
pass
325325
else:
326326
param = params[n]
327327
if not hasattr(model.c,n):
328-
return json({"code":400,"msg":"'%s' don't have field '%s'"%(modelname,n)})
328+
return json({"code":400,"msg":"'%s' don't have field '%s'"%(model_name,n)})
329329
q = model.filter(getattr(model.c,n)==param)
330330
rdict = {
331331
"code":200,

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /