Commit cd02858be93e8e5475bb2f3fabf08ae86d68bea2

Authored by Bartłomiej Nitoń
1 parent c1ffcc25

Cleaning code from comments.

Showing 1 changed file with 10 additions and 51 deletions
dictionary/ajax_lemma_view.py
... ... @@ -278,13 +278,7 @@ def get_arg_id(request, text_rep):
278 278 @ajax(method='get', encode_result=False)
279 279 def get_lemma_preview(request, id, main_lemma_id):
280 280 selected_lemma = Lemma.objects.get(id=id)
281   - #new_frames = selected_lemma.frames.order_by('text_rep')
282   -
283   - #serialized_frames = []
284   - #for frame in new_frames:
285   - # serialized_frames.append(frameObjToSerializableDict(selected_lemma, frame))
286   - #json_frames = json_encode(serialized_frames)
287   -
  281 +
288 282 frame_char_models = Frame_Char_Model.objects.order_by('priority')
289 283 frame_char_prior_model_vals = frame_char_models[0].frame_char_values.all()
290 284  
... ... @@ -294,17 +288,9 @@ def get_lemma_preview(request, id, main_lemma_id):
294 288  
295 289 json_frame_char_list = json_encode(frame_char_list)
296 290  
297   - # konwertowanie przykladow na zrozumiale przez java sript
298   - #nkjp_examples = selected_lemma.nkjp_examples.all()
299   - #nkjp_examples_js = nkjpExamplesObjToJs(nkjp_examples, request.user, selected_lemma)
300   -
301   - #json_nkjp_examples = json_encode(nkjp_examples_js)
302   -
303 291 similarLemmasNewForm = SimilarLemmasNewForm(statuses=Lemma_Status.objects.order_by('priority'))
304 292  
305   - return {#'serialized_frames': json_frames,
306   - 'frame_char_list': json_frame_char_list,
307   - #'nkjp_examples': json_nkjp_examples,
  293 + return {'frame_char_list': json_frame_char_list,
308 294 'selected_lemma': selected_lemma,
309 295 'similarLemmasNewForm': similarLemmasNewForm}
310 296  
... ... @@ -327,41 +313,14 @@ def get_lemma_desc(request, id):
327 313 @render('new_frames.html')
328 314 @ajax(method='get', encode_result=False)
329 315 def get_new_frames(request, id):
330   - selected_lemma = Lemma.objects.get(id=id)
331   - #new_frames = selected_lemma.frames.order_by('text_rep')
332   -
333   -# sprawdz czy uzytkownik jest wlascicielem wybranego hasla
334   - can_modify = user_can_modify(selected_lemma, request.user)
335   -
336   -# serialized_frames = []
337   -# for frame in new_frames:
338   -# serialized_frames.append(frameObjToSerializableDict(selected_lemma, frame, True))
339   -# json_frames = json_encode(serialized_frames)
340   -#
341   -# # konwertowanie przykladow na zrozumiale przez java sript
342   -# nkjp_examples = selected_lemma.nkjp_examples.order_by('source__priority',
343   -# 'opinion__priority',
344   -# 'sentence')
345   -# nkjp_examples_js = nkjpExamplesObjToJs(nkjp_examples, request.user, selected_lemma)
346   -#
347   -# json_nkjp_examples = json_encode(nkjp_examples_js)
348   -#
349   - add_nkjp_form = AddNkjpExampleForm()
350   -#
351   -# lemma_nkjp_examples = selected_lemma.lemma_nkjp_examples.order_by('source__priority',
352   -# 'opinion__priority',
353   -# 'sentence')
354   -# lemma_nkjp_examples_js = nkjpLemmaExamplesObjToJs(lemma_nkjp_examples, request.user, selected_lemma)
355   -# json_lemma_nkjp_examples = json_encode(lemma_nkjp_examples_js)
356   -
357   - return {#'serialized_frames': json_frames,
358   - 'add_nkjp_form': add_nkjp_form,
359   - #'nkjp_examples': json_nkjp_examples,
360   - 'can_modify': can_modify,
361   - 'selected_lemma': selected_lemma,
362   - #'lemma_nkjp_examples': json_lemma_nkjp_examples,
363   - 'skladnica_examples': selected_lemma.skladnica_frames.exists(),
364   - 'xcp_examples': selected_lemma.entry_obj.xcp_examples.exists()}
  316 + selected_lemma = Lemma.objects.get(id=id)
  317 + can_modify = user_can_modify(selected_lemma, request.user)
  318 + add_nkjp_form = AddNkjpExampleForm()
  319 + return {'add_nkjp_form': add_nkjp_form,
  320 + 'can_modify': can_modify,
  321 + 'selected_lemma': selected_lemma,
  322 + 'skladnica_examples': selected_lemma.skladnica_frames.exists(),
  323 + 'xcp_examples': selected_lemma.entry_obj.xcp_examples.exists()}
365 324  
366 325  
367 326 @ajax(method='get', encode_result=True)
... ...