diff --git a/app/assets/javascripts/repositories/renderers/view_renderers.js b/app/assets/javascripts/repositories/renderers/view_renderers.js index fea40efa6..e16a2a135 100644 --- a/app/assets/javascripts/repositories/renderers/view_renderers.js +++ b/app/assets/javascripts/repositories/renderers/view_renderers.js @@ -2,23 +2,29 @@ $.fn.dataTable.render.RepositoryAssetValue = function(data) { var asset = data.value; - return ` -
- ${asset.icon_html} -
- - ${asset.file_name} - + if (asset.id) { + return ` +
+ ${asset.icon_html} +
+ + ${asset.file_name} + +
-
- `; + `; + } + return `
+ + ${I18n.t('my_modules.repository.full_view.error')} +
`; }; $.fn.dataTable.render.defaultRepositoryAssetValue = function() { diff --git a/app/assets/stylesheets/repository/repository_table.scss b/app/assets/stylesheets/repository/repository_table.scss index 63e49e457..e9ad2ee83 100644 --- a/app/assets/stylesheets/repository/repository_table.scss +++ b/app/assets/stylesheets/repository/repository_table.scss @@ -16,6 +16,15 @@ } } + .processing-error { + color: $brand-danger; + margin-left: 2px; + + .fa-exclamation-triangle { + margin-right: 5px; + } + } + .repository-table-error { background: $color-white; display: none; diff --git a/app/serializers/repository_datatable/repository_asset_value_serializer.rb b/app/serializers/repository_datatable/repository_asset_value_serializer.rb index 675b7b0ca..7aa22b4a5 100644 --- a/app/serializers/repository_datatable/repository_asset_value_serializer.rb +++ b/app/serializers/repository_datatable/repository_asset_value_serializer.rb @@ -13,6 +13,8 @@ module RepositoryDatatable file_name: asset.file_name, icon_html: FileIconsHelper.file_extension_icon_html(asset) } + rescue StandardError => e + Rails.logger.error e.message end end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 4b610f3b0..35f8eda32 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -986,6 +986,7 @@ en: modal_live_header: ': Live version' modal_snapshot_header: ': Snapshot of %{snapshot_date}' assign_modal_header: 'Assign from %{repository_name} inventory' + error: 'Error' snapshots: simple_view: live_bottom_label: 'Live version'