Saving lemma with not defined entry bugfix.

Bartłomiej Nitoń
1 parent 43da6c97
Showing 6 changed files with 19 additions and 16 deletions
INSTALL_PL
dictionary/models.py
dictionary/saving.py
semantics/management/commands/find_hanging_connections.py
semantics/management/commands/find_hanging_examples.py
semantics/views.py
@@ -10,8 +10,8 @@ Zainstaluj Django w wersji 1.4.8:
 Zainstaluj Django south:
 >> sudo apt-get install python-django-south
  
-Zainstaluj Django extensions:
->> sudo apt-get install python-django-extensions
+Zainstaluj Django extensions w wersji 1.6.7:
+>> sudo pip install django-extensions==1.6.7
  
 Zainstaluj Django registration w wersji 0.8:
 >> sudo pip install django-registration==0.8 
@@ -1452,7 +1452,15 @@ class Entry(Model):
  
     def actual_lemma(self):
         return self.lemmas.get(old=False)
-    
+
+    def defined(self):
+        entry_defined = True
+        try:
+            self.lemmas.get(old=False)
+        except Lemma.DoesNotExist:
+            entry_defined = False
+        return entry_defined
+
     def __unicode__(self):
         return self.name
  
@@ -95,12 +95,10 @@ def get_disconnect_operations(lemma, frames, connections):
     return operations
  
 def get_shared_schemata_ids(lemma):
-    print lemma
     ids = [f.id for f in lemma.frames.all()]
-    print ids
     for connected in lemma.entry_obj.rel_entries.all():
-        ids += [f.id for f in connected.actual_lemma().frames.all()]
-    print ids
+        if connected.defined():
+            ids += [f.id for f in connected.actual_lemma().frames.all()]
     return ids
  
 def update_connections(lemma_id, reconnect_operations, user):
 #-*- coding:utf-8 -*-
  
-import datetime
  
 from django.core.management.base import BaseCommand
  
@@ -34,4 +33,3 @@ def find_hanging_connections():
                         print 'lemma: %s\tcomplement: %s\trealization: %s' % (lemma.entry_obj.name,
                                                                               compl_ref,
                                                                               unicode(real))
-        
 \ No newline at end of file
@@ -38,5 +38,3 @@ def print_hanging_examples(lemma):
                                                                                                  example.id)
                 for ex in same_lu_examples.all():
                     print 'lu_ex_id: %d' % ex.id
-                
-                
 \ No newline at end of file
@@ -283,11 +283,12 @@ def create_connected_context(lemma_id, user):
     context = {'frames_display': [], 'connections':{'connected_reverse': [], 'connected': []}}
  
     for entry in connected:
-        lemma = entry.actual_lemma()
-        frame_context = create_frames_context(lemma.id, user)
-        context['frames_display'] += frame_context['frames_display']
-        context['connections']['connected'] += frame_context['connections']['connected']
-        context['connections']['connected_reverse'] += frame_context['connections']['connected_reverse']        
+        if entry.defined():
+            lemma = entry.actual_lemma()
+            frame_context = create_frames_context(lemma.id, user)
+            context['frames_display'] += frame_context['frames_display']
+            context['connections']['connected'] += frame_context['connections']['connected']
+            context['connections']['connected_reverse'] += frame_context['connections']['connected_reverse']
  
     return context