Merge pull request #5477 from G-Chubinidze/gc_SCI_8464

CSS: inventory items top toolbar issues [SCI-8464]

app/assets/javascripts/repositories/repository_datatable.js

@@ -81,7 +81,6 @@ var RepositoryDatatable = (function(global) {
 
       if (rowsSelected.length !== 0) {
         $('#editRepositoryRecord').prop('disabled', !allSelectedRowsAreOnPage());
-        $('#importRecordsButton').hide();
 
         if (rowsSelected.some(r=> rowsLocked.indexOf(r) >= 0)) { // Some selected rows is rowsLocked
           $('#editRepositoryRecord').prop('disabled', true);

app/assets/javascripts/repository_columns/index.js

@@ -387,7 +387,7 @@ var RepositoryColumns = (function() {
   }
 
   function initColumnsButton() {
-    $('.repo-datatables-buttons').on('click', '.manage-repo-column-index', function() {
+    $(document).on('click', '.manage-repo-column-index', function() {
       var button = $(this);
       initManageColumnModal(button);
     });
@@ -395,21 +395,19 @@ var RepositoryColumns = (function() {
 
   return {
     init: () => {
-      if ($('.repo-datatables-buttons').length > 0) {
-        initColumnTypeSelector();
-        initCreateSubmitAction();
-        initEditSubmitAction();
-        initDeleteSubmitAction();
-        initBackToManageColumns();
-        initColumnsButton();
-        initManageColumnAction();
-        RepositoryListColumnType.init();
-        RepositoryStatusColumnType.init();
-        RepositoryStockColumnType.init();
-        RepositoryChecklistColumnType.init();
-        RepositoryDateTimeColumnType.init();
-        RepositoryDateColumnType.init();
-      }
+      initColumnTypeSelector();
+      initCreateSubmitAction();
+      initEditSubmitAction();
+      initDeleteSubmitAction();
+      initBackToManageColumns();
+      initColumnsButton();
+      initManageColumnAction();
+      RepositoryListColumnType.init();
+      RepositoryStatusColumnType.init();
+      RepositoryStockColumnType.init();
+      RepositoryChecklistColumnType.init();
+      RepositoryDateTimeColumnType.init();
+      RepositoryDateColumnType.init();
     }
   };
 }());

app/assets/stylesheets/repository/repository_toolbar.scss

@@ -3,7 +3,6 @@
 
 .repository-show {
   .repository-toolbar {
-    align-items: center;
     background-color: $color-white;
     display: flex;
     flex-wrap: nowrap;

app/views/repositories/_toolbar_buttons.html.erb

@@ -76,5 +76,12 @@
         <%= render partial: 'repositories/toolbar/bmt' %>
       </div>
     <% end %>
+    <div class="repo-datatables-buttons">
+      <button class="btn btn-light manage-repo-column-index"
+              data-modal-url="<%= repository_repository_columns_path(@repository) %>"
+              data-action="new">
+        <span class="fas fa-columns">
+      </button>
+    </div>
   </div>
 </template>

app/views/repositories/show.html.erb

@@ -43,13 +43,6 @@
           <%= t('repositories.show.archived_inventory_items', repository_name: @repository.name) %>
         <% end %>
       </div>
-      <div class="repo-datatables-buttons">
-        <button class="btn btn-light manage-repo-column-index icon-btn"
-                data-modal-url="<%= repository_repository_columns_path(@repository) %>"
-                data-action="new">
-          <span class="fas fa-columns">
-        </button>
-      </div>
     </div>
   </div>
 

config/locales/en.yml

@@ -1757,7 +1757,7 @@ en:
         active: "These are individually archived items from the %{repository_name} inventory. The inventory itself is active."
         archived_on: "Inventory archived on"
         archived_by: "by"
-      filter_inventory_items: "Filter items"
+      filter_inventory_items: "Search items"
       filter_inventory_items_with_ean: "Search with EAN code"
       no_items: "No items here"
       no_items_matched: "No items here"