Minor fixes.

Bartłomiej Nitoń
1 parent f84616c8
Showing 2 changed files with 7 additions and 36 deletions
dictionary/models.py
dictionary/static/js/lemma-view.js
@@ -1401,8 +1401,14 @@ class Entry(Model):
         return self.semantic_frames.filter(next__isnull=True, removed=False)
  
     def matching_connections(self, schema, position, phrase_type):
-        frames = self.actual_frames()
+
         matching_connections = []
+
+        frames = self.actual_frames()
+        for entry in self.rel_entries.all():
+            new_frames = entry.actual_frames()
+            frames |= new_frames
+
         for frame in frames:
             for compl in frame.complements.all():
                 matching_realizations = compl.realizations.filter(frame=schema, 
@@ -205,41 +205,6 @@ function load_content(id) {
         loadSchemataAndExamples();
  
         createSplitter('framesSplit','new-frame-tables', 'tabs');
-        /*if(window.can_modify)
-        {
-          addSyntacticFramesPerm = user_has_perm('dictionary.add_syntactic_frames');
-          addPhraseologicFramesPerm = user_has_perm('dictionary.add_phraseologic_frames');
-          
-          if(addSyntacticFramesPerm || addPhraseologicFramesPerm) {
-              $(document).unbind('keydown');
-              $(document).bind('keydown', 'shift+s', saveHandle);
-              $(document).bind('keydown', 'shift+z', function(evt){backOneModification(); return false; });
-              $(document).bind('keydown', 'shift+y', function(evt){forwardOneModification(); return false; });
-              $(document).bind('keydown', 'shift+a', function(evt){addElement(); return false; });
-              $(document).bind('keydown', 'shift+r', function(evt){removeElement(); return false; });
-              $(document).bind('keydown', 'shift+d', function(evt){duplicateElement(); return false; });
-              $(document).bind('keydown', 'shift+c', function(evt){copyElement(); return false; });
-              $(document).bind('keydown', 'shift+v', function(evt){pasteElement(); return false; });
-              $(document).bind('keydown', 'shift+w', function(evt){validateSchemata(); return false; }); 
-              if(addSyntacticFramesPerm) {
-            	  $(document).bind('keydown', 'shift+x', function(evt){cutElement(); return false; });
-                  $(document).bind('keydown', 'shift+m', function(evt){reserveLemma(); return false; });
-              }
-              if(addPhraseologicFramesPerm) {
-            	  $(document).bind('keydown', 'shift+l', function(evt){addPhraseologicFrame(); return false; });
-            	  $(document).bind('keydown', 'shift+b', function(evt){openAssignPhraseologicFrameDialog(); return false; });
-              }
-          }
-        }
-        else
-        {
-          $(document).unbind('keydown');
-          $.get(ajax_user_has_perm, {perm: 'dictionary.own_lemmas'}, function(result) {
-              if(result['has_perm']) {
-            	  $(document).bind('keydown', 'shift+m', function(evt){reserveLemma(); return false; });
-              }
-          });
-        }*/
  
   		if(document.getElementById("lemma_example_show"))
   		{