dokończone utrzymywanie dwustronnych odsyłaczy

janek37
1 parent 78cef100
Showing 9 changed files with 174 additions and 47 deletions
common/util.py
dictionary/ajax_lexeme_view.py
dictionary/models.py
dictionary/static/js/edit.js
dictionary/static/js/lexeme-edit.js
dictionary/templates/lexeme_view.html
dictionary/urls.py
dictionary/views.py
patterns/static/js/pattern-edit.js
@@ -113,7 +113,10 @@ def cut_end(s, end):
  
 def error_messages(form):
     return '\n'.join(
-        '%s: %s' % (form.fields[k].label, ' '.join(v)) if k != '__all__'
+        '%s: %s' % (
+            force_unicode(form.fields[k].label),
+            ' '.join(v))
+        if k != '__all__'
         else ' '.join(v) for k, v in form.errors.iteritems())
  
  
@@ -339,11 +339,12 @@ def update_lexeme(request, form_data):
     for cr_pk in form_dict['deleted_cr']:
         cr = CrossReference.objects.get(pk=cr_pk)
         for rev_cr in cr.reversed():
-            proposed_crs['delete'].append({
-                'cr_id': rev_cr.id,
-                'entry': rev_cr.from_lexeme.entry,
-                'type_desc': rev_cr.type.desc,
-            })
+            if cr.from_lexeme.editable_vocabularies(request.user):
+                proposed_crs['delete'].append({
+                    'cr_id': rev_cr.id,
+                    'entry': rev_cr.from_lexeme.entry,
+                    'type_desc': rev_cr.type.desc,
+                })
         cr.delete()
     submitted_lips = []
     submitted_crs = []
@@ -380,16 +381,17 @@ def update_lexeme(request, form_data):
             cr_form = CrossReferenceForm(data=form_dict, prefix=prefix)
             if cr_form.is_valid():
                 cr = cr_form.save()
-                if not cr.reversed():
-                    rev_type = cr.type.reversed()
-                    if rev_type:
-                        proposed_crs['create'].append({
-                            'type_id': rev_type.id,
-                            'from_lexeme': cr.to_lexeme.id,
-                            'to_lexeme': cr.from_lexeme.id,
-                            'entry': cr.to_lexeme.entry,
-                            'type_desc': rev_type.desc,
-                        })
+                if cr.to_lexeme.editable_vocabularies(request.user):
+                    if not cr.reversed():
+                        rev_type = cr.type.reversed()
+                        if rev_type:
+                            proposed_crs['create'].append({
+                                'type_id': rev_type.id,
+                                'from_lexeme': cr.to_lexeme.id,
+                                'to_lexeme': cr.from_lexeme.id,
+                                'entry': cr.to_lexeme.entry,
+                                'type_desc': rev_type.desc,
+                            })
             else:
                 raise AjaxError(error_messages(cr_form))
     if len(submitted_lips) == 0 and l.is_public():
@@ -485,6 +487,27 @@ def create_derivatives(request, lexeme_id, chosen_derivatives):
     return {}
  
  
+@ajax(method='post')
+def update_back_references(request, deleted_cr, created_cr):
+    user = request.user
+    for cr_data in deleted_cr:
+        cr = CrossReference.objects.get(id=int(cr_data['cr_id']))
+        if cr.from_lexeme.perm(user, 'change'):
+            cr.delete()
+        else:
+            raise AjaxError('access denied')
+    for cr_data in created_cr:
+        from_lexeme = Lexeme.objects.get(id=int(cr_data['from_lexeme']))
+        to_lexeme = Lexeme.objects.get(id=int(cr_data['to_lexeme']))
+        cr_type = CrossReferenceType.objects.get(id=cr_data['type_id'])
+        if from_lexeme.perm(user, 'change'):
+            CrossReference.objects.create(
+                from_lexeme=from_lexeme, to_lexeme=to_lexeme, type=cr_type)
+        else:
+            raise AjaxError('access denied')
+    return {}
+
+
 def update_lexeme_qualifiers(lexeme, user, form_dict, form_data):
     owner = lexeme.owner_vocabulary
     editable_vocabs = editable_vocabularies(user).exclude(pk=owner.pk)
@@ -761,8 +761,9 @@ class Lexeme(Model):
  
     def perm(self, user, action):
         if action == 'view':
-            vocabs = self.vocabularies.all()
-            return bool(vocabs & visible_vocabularies(user))
+            if not user.is_authenticated() and not self.is_public():
+                return False
+            return bool(self.visible_vocabularies(user))
         elif action == 'change':
             priority = user.has_perm('dictionary.lexeme_priority')
             priority |= not (
@@ -73,6 +73,12 @@ var edit = {
         edit.busy_ctrl = null;
     },
  
+    cleanup: function() {
+        "use strict";
+        edit.changed = false;
+        edit.busy_off();
+    },
+
     confirm_discard: function() {
         "use strict";
         return window.confirm(
@@ -127,7 +133,7 @@ $(function() {
     "use strict";
     $(document).on(
         'submit', '#' + edit.form_id, function() {
-            $(this).find('button[type=submit]').button('disable');
+            $('.' + edit.form_submit_class).button('disable');
             var this_form = $(this);
             var form_data = this_form.serializeArray();
             edit.form_submit(form_data);
@@ -195,6 +195,26 @@ $.extend(edit, {
                 }
             ]
         });
+        $('#back-references-dialog').dialog({
+            autoOpen: false,
+            width: 'auto',
+            modal: true,
+            buttons: [
+                {
+                    text: gettext("Anuluj"),
+                    click: function() {
+                        $(this).dialog('close');
+                    }
+                },
+                {
+                    text: gettext("Zastosuj"),
+                    click: function() {
+                        $(this).dialog('close');
+                        update_back_references();
+                    }
+                }
+            ]
+        });
         $('#action-button').click(function () {
             $('#group-action-dialog').dialog('open');
         });
@@ -420,44 +440,50 @@ $.extend(edit, {
                 } else {
                     edit.load_content(edit_id);
                 }
-                if (data.derivatives.length > 0) {
-                    auto_derivatives = data.derivatives;
-                    var ul = $('#auto-derivatives-list');
-                    ul.empty();
-                    $.each(data.derivatives, function(i, der_data) {
-                        var li = $('<li/>');
-                        var name = 'der' + i;
-                        var input = $('<input/>').attr('type', 'checkbox')
-                            .attr('name', name).attr('id', name);
-                        var label = $('<label/>').attr('for', name);
-                        li.append(input).append(label).appendTo(ul);
-                        if (der_data.entry) {
-                            label.text(der_data.cr_type + ', ' + der_data.entry);
-                        } else {
-                            var der_input = $('<input/>').attr('type', 'text')
-                                .addClass('derivative-input');
-                            label.text(der_data.cr_type + ', ');
-                            li.append(der_input);
-                        }
-                    });
-                    $('#auto-derivatives-dialog').dialog('open');
-                }
+                suggest_back_references(data.proposed_crs);
+                suggest_derivatives(data.derivatives);
             },
             error_callback: function (xhr, status, error) {
                 common.error_alert(status + ': ' + error);
-                edit.busy_off();
+                edit.cleanup();
             },
             bad_data_callback: function () {
-                edit.busy_off();
+                edit.cleanup();
                 return true;
             }
         });
         if (result === false) {
-            edit.busy_off();
+            edit.cleanup();
         }
     }
 });
  
+function suggest_derivatives(derivatives) {
+    "use strict";
+    if (derivatives.length > 0) {
+        auto_derivatives = derivatives;
+        var ul = $('#auto-derivatives-list');
+        ul.empty();
+        $.each(derivatives, function (i, der_data) {
+            var li = $('<li/>');
+            var name = 'der' + i;
+            var input = $('<input/>').attr('type', 'checkbox')
+                .attr('name', name).attr('id', name);
+            var label = $('<label/>').attr('for', name);
+            li.append(input).append(label).appendTo(ul);
+            if (der_data.entry) {
+                label.text(der_data.cr_type + ', ' + der_data.entry);
+            } else {
+                var der_input = $('<input/>').attr('type', 'text')
+                    .addClass('derivative-input');
+                label.text(der_data.cr_type + ', ');
+                li.append(der_input);
+            }
+        });
+        $('#auto-derivatives-dialog').dialog('open');
+    }
+}
+
 function create_auto_derivatives() {
     "use strict";
     // zebrać numery derywatów do utworzenia
@@ -492,6 +518,66 @@ function create_auto_derivatives() {
     });
 }
  
+function suggest_back_references(proposed_crs) {
+    "use strict";
+    if (proposed_crs.delete.length > 0 || proposed_crs.create.length > 0) {
+        var cr_container = $('#proposed-crs'), ul;
+        cr_container.empty();
+        if (proposed_crs.delete.length > 0) {
+            var delete_label = $('<p/>').text(gettext("Do usunięcia:"));
+            ul = $('<ul/>').attr('id', 'delete-cr');
+            $.each(proposed_crs.delete, function(i, cr_data) {
+                var li = $('<li/>');
+                var name = 'del_cr' + cr_data.cr_id;
+                var input = $('<input/>').attr('type', 'checkbox')
+                    .attr('name', name).attr('id', name)
+                    .data('cr_data', cr_data);
+                var label = $('<label/>').attr('for', name)
+                    .text(cr_data.entry + ', ' + cr_data.type_desc);
+                li.append(input).append(label).appendTo(ul);
+            });
+            cr_container.append(delete_label).append(ul);
+        }
+        if (proposed_crs.create.length > 0) {
+            var create_label = $('<p/>').text(gettext("Do dodania:"));
+            ul = $('<ul/>').attr('id', 'create-cr');
+            $.each(proposed_crs.create, function(i, cr_data) {
+                var li = $('<li/>');
+                var name = 'new_cr' + cr_data.type_id + '-' +
+                    cr_data.from_lexeme;
+                var input = $('<input/>').attr('type', 'checkbox')
+                    .attr('name', name).attr('id', name)
+                    .data('cr_data', cr_data);
+                var label = $('<label/>').attr('for', name)
+                    .text(cr_data.entry + ', ' + cr_data.type_desc);
+                li.append(input).append(label).appendTo(ul);
+            });
+            cr_container.append(create_label).append(ul);
+        }
+        $('#back-references-dialog').dialog('open');
+    }
+}
+
+function update_back_references() {
+    "use strict";
+    var chosen_delete = [], chosen_create = [];
+    $('#delete-cr').find(':checked').each(function(i, elem) {
+        chosen_delete.push($(elem).data('cr_data'));
+    });
+    $('#create-cr').find(':checked').each(function(i, elem) {
+        chosen_create.push($(elem).data('cr_data'));
+    });
+    $.ajaxJSON({
+        method: 'post',
+        url: $dj.ajax_update_back_references,
+        data: {
+            deleted_cr: chosen_delete,
+            created_cr: chosen_create
+        },
+        description: gettext("Zaktualizowanie zwrotnych derywatów")
+    });
+}
+
 var deleted, deleted_cr;
  
 function get_pos() {
@@ -193,4 +193,7 @@
         <table id="search-by-form-table">
         </table>
     </div>
+    <div id="back-references-dialog" title="{% trans 'Zwrotne odsyłacze' %}">
+        <div id="proposed-crs"></div>
+    </div>
 {% endblock %}
@@ -43,6 +43,7 @@ urlpatterns += patterns(
     url(r'^ajax/dynamic-fields/$', 'dynamic_action_fields'),
     url(r'^ajax/execute-actions/$', 'execute_group_actions'),
     url(r'^ajax/create-derivatives/$', 'create_derivatives'),
+    url(r'^ajax/update-back-references/$', 'update_back_references'),
     url(r'^ajax/clone-lexeme/$', 'clone_lexeme'),
     url(r'^ajax/get-entry/$', 'get_entry'),
 )
@@ -147,6 +147,7 @@ def lexeme_view(request):
         'ajax_dynamic_fields': reverse('dynamic_action_fields'),
         'ajax_execute_actions': reverse('execute_group_actions'),
         'ajax_create_derivatives': reverse('create_derivatives'),
+        'ajax_update_back_references': reverse('update_back_references'),
         'ajax_clone_lexeme': reverse('clone_lexeme'),
         'vocabs': vocabs,
         'bs_options': [
@@ -157,7 +157,7 @@ $.extend(edit, {
         });
         form_data.push({name: 'ending_list', value: ending_list});
         edit.busy_on();
-        $.ajaxJSON({
+        var result = $.ajaxJSON({
             method: 'post',
             url: $dj.ajax_update_pattern,
             data: {
@@ -171,13 +171,16 @@ $.extend(edit, {
             },
             error_callback: function (xhr, status, error) {
                 common.error_alert(status + ': ' + error);
-                edit.busy_off();
+                edit.cleanup();
             },
             bad_data_callback: function () {
-                edit.busy_off();
+                edit.cleanup();
                 return true;
             }
         });
+        if (result === false) {
+            edit.cleanup();
+        }
     }
 });