Merge branch 'devbyspi' into 'master'

Bugfix Sortable.js

See merge request fronk/thetool!123

Layout/default/Pop/Detail.php

@@ -601,33 +601,35 @@ if (!empty(trim($pops->vlan_ipv6)))
 
 <?php endif; ?>
 
-<script src="https://raw.githack.com/SortableJS/Sortable/master/Sortable.js"></script>
+<script type="text/javascript" src="<?= self::getResourcePath() ?>assets/js/Sortable.js"></script>
 <script type="text/javascript">
     var hidesearch = [5, 6];
     var trigger;
     $(document).ready(function () {
-        Sortable.create(sortracklist, {
-            handle: '.move-handle',
-            onEnd: function () {
+        if ($('#sortracklist').length > 0) {
+            Sortable.create(sortracklist, {
+                handle: '.move-handle',
+                onEnd: function () {
 
-                var popid = $('#sortracklist').data('popid');
-                var racksortids = [];
+                    var popid = $('#sortracklist').data('popid');
+                    var racksortids = [];
 
-                $('#sortracklist').find('th').each(function (index, value) {
+                    $('#sortracklist').find('th').each(function (index, value) {
 
-                    racksortids.push($(this).data('rackid'));
-                });
-                $.post("<?= self::getUrl("Poprack", "api", ['do' => 'sortRack']) ?>&pop_id=" + popid, {
-                    racksortids: racksortids
-                }, function (data) {
-                    if (data.success === true) {
+                        racksortids.push($(this).data('rackid'));
+                    });
+                    $.post("<?= self::getUrl("Poprack", "api", ['do' => 'sortRack']) ?>&pop_id=" + popid, {
+                        racksortids: racksortids
+                    }, function (data) {
+                        if (data.success === true) {
 
-                    }
-                }, "json");
+                        }
+                    }, "json");
 
-            }
+                }
 
-        });
+            });
+        }
         $('#pop-rack-div').show();
         $('#rackModal').on('show.bs.modal', function (event) {
                 var thisclick = $(event.relatedTarget);