Skip to content

Commit b8a2d61

Browse files
committed
fix select all checkbox adding empty entry in ids list, closes #129
1 parent 13c38e4 commit b8a2d61

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

lib/kaffy_web/controllers/resource_controller.ex

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ defmodule KaffyWeb.ResourceController do
318318
"id" => id,
319319
"action_key" => action_key
320320
}) do
321-
322321
my_resource = Kaffy.Utils.get_resource(conn, context, resource)
323322
entry = Kaffy.ResourceQuery.fetch_resource(conn, my_resource, id)
324323
actions = Kaffy.ResourceAdmin.resource_actions(my_resource, conn)

lib/kaffy_web/templates/layout/app.html.eex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@
160160
<script src="/kaffy/assets/js/off-canvas.js"></script>
161161
<script src="/kaffy/assets/js/hoverable-collapse.js"></script>
162162
<script src="/kaffy/assets/js/misc.js"></script>
163-
<script src="/kaffy/assets/js/select-all-checkbox.js"></script>
163+
<script src="/kaffy/assets/js/select-all-checkbox.js?v=20"></script>
164164
<script src="/kaffy/assets/js/phoenix_html.js"></script>
165-
<script src="/kaffy/assets/js/dashboard.js"></script>
165+
<script src="/kaffy/assets/js/dashboard.js?v=20"></script>
166166
<%= for js <- Kaffy.Utils.extensions(@conn).javascripts do %>
167167
<%= js %>
168168
<% end %>

priv/static/assets/js/dashboard.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ $(document).ready(function () {
3030
var actionForm = $(this);
3131
var selected = $.map($("input.kaffy-resource-checkbox:checked"), function (e) {
3232
return $(e).val();
33-
});
33+
}).filter(function (n) {
34+
return n != "";
35+
}).join();
3436

35-
$("input.kaffy-resource-checkbox:checked").each(function () {
36-
$("<input />").attr("type", "hidden").attr("name", "ids").attr("value", selected.join()).appendTo(actionForm);
37-
});
37+
$("<input />").attr("type", "hidden").attr("name", "ids").attr("value", selected).appendTo(actionForm);
3838

3939
return true;
4040
});

priv/static/assets/js/select-all-checkbox.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
if (items.length < 1) {
3030
alert("no selected items!!!");
3131
} else {
32-
var values = items.join(',');
32+
var values = items.filter(function (e) { return e != ""; }).join(',');
3333
var html = $("<div></div>");
3434
html.html("selected:" + values);
3535
html.appendTo("body");
@@ -55,7 +55,7 @@
5555
function checkSelected() {
5656
var all = $("input.select-all")[0];
5757
var total = $("input.select-item").length;
58-
var len = $("input.select-item:checked:checked").length;
58+
var len = $("input.select-item:checked").length;
5959
var html = $('<span class="badge badge-secondary">' + len + " / " + total + " selected" + '</span>');
6060
$("#checkbox-selected-count").html(html);
6161
all.checked = len === total;

0 commit comments

Comments
 (0)