Merge pull request #141 from PetrDlouhy/develop

fix #139 + renew highlighting changed preview
saxix · Nov 21, 2017 · 2c12e70 · 2c12e70
2 parents f9de9a0 + b509e28
commit 2c12e70
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/adminactions/static/adminactions/js/merge.js b/src/adminactions/static/adminactions/js/merge.js
@@ -30,11 +30,23 @@
                     $(this).find('td.other').addClass("selected");
                     $('p.display', $result).text($('p.display', $right).text());
                     RIGHT.push(field_name);
-                }else if ($('.original .display', this).text() !== $('.result .display', this).text()){
+                }
+                $('input[name=field_names]').val(RIGHT);
+            });
+            $('.mergetable tr.preview-row').each(function () {
+
+                var $result = $(this).find('td.result');
+                var $left = $(this).find('td.origin');
+                var $right = $(this).find('td.other');
+                var field_name = $(this).find('td:first').attr('data-content');
+
+
+                $('td', this).removeClass("selected");
+
+                if ($('.original .display', this).text() !== $('.result .display', this).text()){
                     $(this).addClass("changed");
                 }
             });
-            $('input[name=field_names]').val(RIGHT);
         };
 
         $('a.origin').click(select("td.origin"));

diff --git a/src/adminactions/static/adminactions/js/merge.min.js b/src/adminactions/static/adminactions/js/merge.min.js
diff --git a/src/adminactions/templates/adminactions/merge_preview.html b/src/adminactions/templates/adminactions/merge_preview.html
@@ -24,7 +24,7 @@
             <th>{% trans "After Merging" %}</th>
         </tr>
         {% for field in fields %}
-        <tr class="{% cycle "row2" "row1" %}">
+        <tr class="{% cycle "row2" "row1" %} preview-row">
             <th class="column label">{{ master|verbose_name:field.name }}</th>
             <td class="column original">
                 <span class="display">{{ original|field_display:field.name }}</span>