Commit fc3637f004e082465dbcbf0d022654058028a3d1
1 parent
6fb56e07
Need conversion error fix.
Showing
2 changed files
with
7 additions
and
4 deletions
dictionary/admin.py
... | ... | @@ -31,6 +31,9 @@ class LemmaAdmin(admin.ModelAdmin): |
31 | 31 | 'B_frames', 'nkjp_examples', 'frame_opinions', 'lemma_nkjp_examples', |
32 | 32 | 'status_history') |
33 | 33 | |
34 | +class ChangeAdmin(admin.ModelAdmin): | |
35 | + search_fields = ('entry__entry',) | |
36 | + | |
34 | 37 | class FrameAdmin(admin.ModelAdmin): |
35 | 38 | filter_horizontal = ('positions',) |
36 | 39 | search_fields = ('text_rep',) |
... | ... | @@ -135,7 +138,7 @@ admin.site.register(Frame_Characteristic) |
135 | 138 | admin.site.register(Frame_Char_Model) |
136 | 139 | admin.site.register(Frame_Char_Value) |
137 | 140 | admin.site.register(Message) |
138 | -admin.site.register(Change) | |
141 | +admin.site.register(Change, ChangeAdmin) | |
139 | 142 | admin.site.register(NKJP_ArgSelection, NKJP_ArgSelectionAdmin) |
140 | 143 | admin.site.register(NKJP_Source) |
141 | 144 | admin.site.register(NKJP_Opinion) |
... | ... |
dictionary/static/js/lemma-view.js
... | ... | @@ -4006,13 +4006,13 @@ function restore_lemma() { |
4006 | 4006 | function addPhraseologicFrame() |
4007 | 4007 | { |
4008 | 4008 | if(selected_id != -1) { |
4009 | - elem_in_bucket = getElementInstance(selected_id, schemas); | |
4009 | + var schema = getElementInstance(selected_id, schemas); | |
4010 | 4010 | var parent_elem = getParentInstance(selected_id, schemas); |
4011 | 4011 | |
4012 | 4012 | if(parent_elem['type']=='lemma' |
4013 | - && !elem_in_bucket['element'].is_phraseologic | |
4013 | + && !schema['element'].is_phraseologic | |
4014 | 4014 | && user_has_perm('dictionary.add_phraseologic_frames')) { |
4015 | - var duplicate = $.evalJSON($.toJSON(elem_in_bucket['element'])); | |
4015 | + var duplicate = $.evalJSON($.toJSON(schema['element'])); | |
4016 | 4016 | duplicate.id = new_elem_id; |
4017 | 4017 | new_elem_id--; |
4018 | 4018 | duplicate.is_phraseologic = true; |
... | ... |