Skip to content

A free open source IT asset/license management system

fix share button, saving js changes for testing

Godfrey M40568942eaa6
diff --git a/resources/assets/js/snipeit.js b/resources/assets/js/snipeit.js
index 580335b96e..68ad03911a 100755
--- a/resources/assets/js/snipeit.js
+++ b/resources/assets/js/snipeit.js
@@ -138,7 +138,7 @@ $(function () {
});
// confirm delete modal
- $el.on('click', '.delete-asset', function (evnt) {
+ $el.on('click', '.delete-asset, .delete-custom-label', function (evnt) {
var $context = $(this);
var $dataConfirmModal = $('#dataConfirmModal');
var href = $context.attr('href');
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 666a9aecb7..d2d293c95c 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -1893,11 +1893,10 @@
return linkToUserSectionBasedOnCount(value, row.id, 'managed-locations');
}
- function labelActionsFormatter(value, row, index) {
+ function labelActionsFormatter(value, row) {
if (!row.name) return '';
const editUrl = '{{ route('settings.labels.edit') }}';
- const deleteUrl = '{{ route('settings.labels.destroy', '__id__') }}';
let actions = `
<a href="${editUrl}?label=${encodeURIComponent(row.name)}"
@@ -1908,32 +1907,34 @@
<span class="sr-only">{{ trans('general.clone') }}</span>
</a>
`;
- // Only allow delete/share for custom labels
+ // Only allow delete || share for custom labels
if (row.source === 'custom') {
// Share button
- actions += `
- <button
- type="button"
- class="btn btn-sm btn-primary copy-label-json"
- title="Share Label"
- data-tooltip="true"
- >
- <i class="fa-solid fa-up-right-from-square"></i>
- <span class="sr-only">Share Label</span>
- </button>
- `;
- // Delete button
-
- var safeName = $('<div>').text(row.name || 'this label').html();
+ var encodedJson = encodeURIComponent(JSON.stringify(row.config_snapshot || {}, null, 2));
actions += '<button type="button" '
- + 'class="btn btn-danger btn-sm delete-custom-label hidden-print" '
- + 'data-id="' + row.custom_label_id + '" '
- + 'data-name="' + safeName + '">'
+ + 'class="btn btn-primary btn-sm copy-label-json hidden-print" '
+ + 'data-json="' + encodedJson + '" '
+ + 'title="Share Label" '
+ + 'data-tooltip="true">'
+ + '<i class="fa-solid fa-up-right-from-square"></i>'
+ + '<span class="sr-only">Share Label</span>'
+ + '</button>&nbsp;';
+
+ // Delete button
+ var safeName = $('<div>').text(row.name || 'this label').html();
+ var deleteUrl = deleteLabelUrlTemplate.replace('__LABEL_ID__', row.custom_label_id);
+
+ actions += '<a href="' + deleteUrl + '" '
+ + 'class="actions btn btn-danger btn-sm delete-custom-label hidden-print" '
+ + 'data-tooltip="true" '
+ + 'data-icon="fa-trash" '
+ + 'data-content="{{ trans('general.sure_to_delete') }}: ' + safeName + '?" '
+ + 'data-title="{{ trans('general.delete') }}">'
+ '<x-icon type="delete" class="fa-fw" />'
+ '<span class="sr-only">{{ trans('general.delete') }}</span>'
- + '</button>&nbsp;';
+ + '</a>&nbsp;';
}
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 49e3a6e121..5661b2e05e 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -645,40 +645,43 @@
});
const deleteLabelUrlTemplate = "{{ route('settings.labels.destroy', ['label' => '__LABEL_ID__']) }}";
- $(document).on('click', '.delete-custom-label', function (e) {
+ $(document).on('click', '.copy-label-json', async function (e) {
e.preventDefault();
e.stopPropagation();
- const id = $(this).data('id');
- const name = $(this).data('name') || 'this label';
-
- if (!confirm('{{ trans('general.sure_to_delete') }}: ' + name + '?')) {
- return;
- }
-
- const url = deleteLabelUrlTemplate.replace('__LABEL_ID__', id);
-
- $('#delete-custom-label-form')
- .attr('action', url)
- .trigger('submit');
- });
- $(document).on('click', '.label-config-snapshot', async function () {
- const index = $(this).data('index');
- const row = $('#label2TemplateTable').bootstrapTable('getData')[index];
-
- if (!row || !row.config_snapshot) {
- alert('No config snapshot found.');
- return;
- }
-
- const json = JSON.stringify(row.config_snapshot, null, 2);
+ const $btn = $(this);
+ const originalHtml = $btn.html();
try {
+ const json = decodeURIComponent($btn.data('json'));
+
await navigator.clipboard.writeText(json);
- alert('Label JSON copied!');
+
+ $btn
+ .removeClass('btn-primary')
+ .addClass('btn-success')
+ .html('<i class="fa fa-check"></i>');
+
+ setTimeout(() => {
+ $btn
+ .removeClass('btn-success')
+ .addClass('btn-primary')
+ .html(originalHtml);
+ }, 1500);
} catch (e) {
console.error(e);
- alert('Could not copy label JSON.');
+
+ $btn
+ .removeClass('btn-primary')
+ .addClass('btn-danger')
+ .html('<i class="fa fa-times"></i>');
+
+ setTimeout(() => {
+ $btn
+ .removeClass('btn-danger')
+ .addClass('btn-primary')
+ .html(originalHtml);
+ }, 1500);
}
});
</script>