From f52ccfd6069a0a27b5c332ae9790777ebaf33ca5 Mon Sep 17 00:00:00 2001 From: mlorb Date: Tue, 7 Aug 2018 11:47:26 +0200 Subject: [PATCH 01/11] fix editing of inventory items of hidden columns --- .../repositories/forms/repository_item_edit.js | 15 ++++++++++----- app/controllers/repository_rows_controller.rb | 10 +++------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/repositories/forms/repository_item_edit.js b/app/assets/javascripts/repositories/forms/repository_item_edit.js index 1cbd8b08a..acb2b1cce 100644 --- a/app/assets/javascripts/repositories/forms/repository_item_edit.js +++ b/app/assets/javascripts/repositories/forms/repository_item_edit.js @@ -125,14 +125,19 @@ } else { var colId = element.replace('colId-', ''); var $el = $('#' + element); + // don't save anything if element is not visible + if($el.length == 0) { + return true; + } if($el.attr('type') === 'file') { - // don't save anything if element is deleted + // handle deleting of element if($el.attr('remove') === "true") { - return true; + formDataObj.append('repository_cells[' + colId + ']', 'remove'); + } else { + formDataObj.append('repository_cells[' + colId + ']', + getFileValue($el)); } - formDataObj.append('repository_cells[' + colId + ']', - getFileValue($el)); - } else if(value.length > 0) { + } else if(value.length >= 0) { formDataObj.append('repository_cells[' + colId + ']', value); } } diff --git a/app/controllers/repository_rows_controller.rb b/app/controllers/repository_rows_controller.rb index b7feb3f0e..084a0d9df 100644 --- a/app/controllers/repository_rows_controller.rb +++ b/app/controllers/repository_rows_controller.rb @@ -134,7 +134,7 @@ class RepositoryRowsController < ApplicationController existing.delete end elsif existing.value_type == 'RepositoryAssetValue' - next if value.blank? + existing.value.destroy && next if value == 'remove' if existing.value.asset.update(file: value) existing.value.asset.created_by = current_user existing.value.asset.last_modified_by = current_user @@ -145,6 +145,7 @@ class RepositoryRowsController < ApplicationController } end else + existing.value.destroy && next if value == '' existing.value.data = value if existing.value.save record_annotation_notification(@record, existing) @@ -156,17 +157,12 @@ class RepositoryRowsController < ApplicationController end end else + next if value == '' # Looks like it is a new cell, so we need to create new value, cell # will be created automatically next if create_cell_value(@record, key, value, errors).nil? end end - # Clean up empty cells, not present in updated record - @record.repository_cells.each do |cell| - next if cell.value_type == 'RepositoryListValue' - cell.value.destroy unless cell_params - .key?(cell.repository_column_id.to_s) - end else @record.repository_cells.each { |c| c.value.destroy } end From 45a4c1c598bd369ecd2ad049813c74442069e558 Mon Sep 17 00:00:00 2001 From: Zanz2 Date: Tue, 14 Aug 2018 13:26:48 +0200 Subject: [PATCH 02/11] changed the icons as per last comment in jira issue --- app/assets/javascripts/sitewide/drag_n_drop.js.erb | 4 ++-- app/views/my_modules/archive/_result.html.erb | 2 +- app/views/my_modules/protocols/_protocol_buttons.html.erb | 4 ++-- app/views/protocols/index.html.erb | 6 +++--- app/views/reports/new/_report_navigation.html.erb | 4 +++- app/views/search/index.html.erb | 2 +- app/views/search/results/_assets.html.erb | 2 +- app/views/search/results/_results.html.erb | 2 +- app/views/steps/_empty_step.html.erb | 2 +- app/views/steps/_form_assets.html.erb | 2 +- 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/sitewide/drag_n_drop.js.erb b/app/assets/javascripts/sitewide/drag_n_drop.js.erb index dcc56621c..2a468b317 100644 --- a/app/assets/javascripts/sitewide/drag_n_drop.js.erb +++ b/app/assets/javascripts/sitewide/drag_n_drop.js.erb @@ -270,7 +270,7 @@ function _uploadedAssetPreview(asset, i) { var html = '
'; html += '
'; - html += ''; + html += ''; html += '<%= I18n.t 'assets.drag_n_drop.file_label' %>'; html += '
'; html += ''; @@ -442,7 +442,7 @@ function _uploadedAssetPreview(asset, i) { var html = '
'; html += '
'; - html += ''; + html += ''; html += '<%= I18n.t 'assets.drag_n_drop.file_label' %>'; html += '
'; html += ''; diff --git a/app/views/my_modules/archive/_result.html.erb b/app/views/my_modules/archive/_result.html.erb index 0693efad5..247b16f82 100644 --- a/app/views/my_modules/archive/_result.html.erb +++ b/app/views/my_modules/archive/_result.html.erb @@ -39,7 +39,7 @@ <% if result.asset.is_image? %> <% else %> - + <% end %> <% elsif result.is_text %> diff --git a/app/views/my_modules/protocols/_protocol_buttons.html.erb b/app/views/my_modules/protocols/_protocol_buttons.html.erb index 09f128cdd..b233e5dd2 100644 --- a/app/views/my_modules/protocols/_protocol_buttons.html.erb +++ b/app/views/my_modules/protocols/_protocol_buttons.html.erb @@ -17,12 +17,12 @@ <% if can_manage_protocol_in_module?(@protocol) %>
  • -  <%= t("my_modules.protocols.buttons.load_protocol_from_file") %> +  <%= t("my_modules.protocols.buttons.load_protocol_from_file") %>
    • <% else %> -
  •  <%= t("my_modules.protocols.buttons.load_protocol_from_file") %>
    • +
  •  <%= t("my_modules.protocols.buttons.load_protocol_from_file") %>
    • <% end %>
    diff --git a/app/views/protocols/index.html.erb b/app/views/protocols/index.html.erb index 006ae081d..7d8c1ccc3 100644 --- a/app/views/protocols/index.html.erb +++ b/app/views/protocols/index.html.erb @@ -57,7 +57,7 @@
    • > - +
    • <%= link_to "#modal-import-json-protocol", "data-toggle" => "modal" do %> - + <% end %>
      • @@ -81,7 +81,7 @@
      - +
      diff --git a/app/views/reports/new/_report_navigation.html.erb b/app/views/reports/new/_report_navigation.html.erb index 220b1c39b..fc81f3f23 100644 --- a/app/views/reports/new/_report_navigation.html.erb +++ b/app/views/reports/new/_report_navigation.html.erb @@ -21,7 +21,7 @@
      <%= hidden_field_tag "html", "" %> <%= link_to "", class: "btn btn-default", remote: true, id: "get-report-pdf" do %> - + <% end %>
      @@ -30,6 +30,8 @@ diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb index e5f8b746a..3d7cec88f 100644 --- a/app/views/search/index.html.erb +++ b/app/views/search/index.html.erb @@ -182,7 +182,7 @@ match_case: @search_case, utf8: '✓', search_id: @search_id}.to_query %>"> <%= @asset_search_count %> - + <%= t'Assets' %> diff --git a/app/views/search/results/_assets.html.erb b/app/views/search/results/_assets.html.erb index 255a8b769..aca60e989 100644 --- a/app/views/search/results/_assets.html.erb +++ b/app/views/search/results/_assets.html.erb @@ -6,7 +6,7 @@ <% if wopi_file?(asset) %> <%= file_extension_icon(asset) %> <% else %> - + <% end %> <% end %> <%= render partial: "search/results/partials/asset_text.html.erb", locals: { asset: asset, query: search_query } %> diff --git a/app/views/search/results/_results.html.erb b/app/views/search/results/_results.html.erb index a9dfaef71..4d8a56152 100644 --- a/app/views/search/results/_results.html.erb +++ b/app/views/search/results/_results.html.erb @@ -8,7 +8,7 @@ <% if result.asset.is_image? %> <% else %> - + <% end %> <% end %> <%= render partial: "search/results/partials/result_text.html.erb", locals: { result: result, query: search_query, target: nil } %> diff --git a/app/views/steps/_empty_step.html.erb b/app/views/steps/_empty_step.html.erb index 370666a4f..8d6907cdf 100644 --- a/app/views/steps/_empty_step.html.erb +++ b/app/views/steps/_empty_step.html.erb @@ -14,7 +14,7 @@ id="new-step-assets-tab" onClick="dragNdropAssetsInit('steps')"> - + <%= t("protocols.steps.new.tab_assets") %> diff --git a/app/views/steps/_form_assets.html.erb b/app/views/steps/_form_assets.html.erb index 938e04732..d443d9fe9 100644 --- a/app/views/steps/_form_assets.html.erb +++ b/app/views/steps/_form_assets.html.erb @@ -1,6 +1,6 @@
      - + <%= t("protocols.steps.new.asset_panel_title") %>
      <% unless ff.object.file.exists? && ff.object.locked? %> From 1a572890097d513ee6012eb3b1edea4512e7ac68 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Fri, 17 Aug 2018 16:13:21 +0200 Subject: [PATCH 03/11] Improve health check endpoint [SCI-2604] --- app/controllers/api/api_controller.rb | 2 ++ config/initializers/extends.rb | 2 +- config/initializers/silencer.rb | 3 ++- docker-compose.yml | 2 +- spec/controllers/api/api_controller_spec.rb | 16 +++++++++++++++- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/api_controller.rb b/app/controllers/api/api_controller.rb index 630e7fa4c..5a52ea4f3 100644 --- a/app/controllers/api/api_controller.rb +++ b/app/controllers/api/api_controller.rb @@ -34,6 +34,8 @@ module Api end def health + User.new && Team.new && Project.new + User.first if params[:db] render plain: 'RUNNING' end diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb index d186191da..f4d4c798c 100644 --- a/config/initializers/extends.rb +++ b/config/initializers/extends.rb @@ -61,7 +61,7 @@ class Extends repository_asset_value: :asset] # List of implemented core API versions - API_VERSIONS = ['20170715'] + API_VERSIONS = %w(20170715 v1) # Array used for injecting names of additional authentication methods for API API_PLUGABLE_AUTH_METHODS = [:azure_jwt_auth] diff --git a/config/initializers/silencer.rb b/config/initializers/silencer.rb index 747b4d838..6b3fda2f0 100644 --- a/config/initializers/silencer.rb +++ b/config/initializers/silencer.rb @@ -7,7 +7,8 @@ Rails.application.configure do config.log_tags, silence: [ # Silence WickedPDF rendering in logs - %r{/projects/[0-9]*/reports/generate.pdf} + %r{/projects/[0-9]*/reports/generate.pdf}, + '/api/health' ] ) end diff --git a/docker-compose.yml b/docker-compose.yml index 6d89be949..12186ebb6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: db: container_name: scinote_db_development - image: postgres:9.4 + image: postgres:9.6 volumes: - scinote_development_postgres:/var/lib/postgresql/data diff --git a/spec/controllers/api/api_controller_spec.rb b/spec/controllers/api/api_controller_spec.rb index 82e6d28fb..74be98d7d 100644 --- a/spec/controllers/api/api_controller_spec.rb +++ b/spec/controllers/api/api_controller_spec.rb @@ -1,6 +1,18 @@ require 'rails_helper' describe Api::ApiController, type: :controller do + describe 'GET #health' do + before do + get :health + end + + it 'Returns HTTP success and with correct text' do + expect(response).to be_success + expect(response).to have_http_status(200) + expect(response.body).to match('RUNNING') + end + end + describe 'GET #status' do before do get :status @@ -17,7 +29,9 @@ describe Api::ApiController, type: :controller do expect(hash_body).to match( 'message' => I18n.t('api.core.status_ok'), 'versions' => [{ 'version' => '20170715', - 'baseUrl' => '/api/20170715/' }] + 'baseUrl' => '/api/20170715/' }, + { 'version' => 'v1', + 'baseUrl' => '/api/v1/' }] ) end end From 6795b08a914db4a5d835464eeab8303690cd6d0a Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Mon, 20 Aug 2018 13:13:34 +0200 Subject: [PATCH 04/11] Refactor invite users modal initialization [SCI-2651] --- .../javascripts/users/settings/teams/invite_users_modal.js | 4 +++- app/assets/javascripts/users/settings/teams/show.js | 2 -- app/views/users/settings/teams/show.html.erb | 3 ++- config/initializers/assets.rb | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/users/settings/teams/invite_users_modal.js b/app/assets/javascripts/users/settings/teams/invite_users_modal.js index 98c0ed51a..51cd11c53 100644 --- a/app/assets/javascripts/users/settings/teams/invite_users_modal.js +++ b/app/assets/javascripts/users/settings/teams/invite_users_modal.js @@ -164,8 +164,10 @@ } function initializeModalsToggle() { - $("[data-trigger='invite-users']").on('click', function() { + $("[data-trigger='invite-users']").on('click', function(event) { var id = $(this).attr('data-modal-id'); + event.preventDefault(); + event.stopPropagation(); $('[data-role=invite-users-modal][data-id=' + id + ']') .modal('show'); }); diff --git a/app/assets/javascripts/users/settings/teams/show.js b/app/assets/javascripts/users/settings/teams/show.js index 26b9f8d8e..5972d1bce 100644 --- a/app/assets/javascripts/users/settings/teams/show.js +++ b/app/assets/javascripts/users/settings/teams/show.js @@ -1,5 +1,3 @@ -//= require users/settings/teams/invite_users_modal - (function() { 'use strict'; diff --git a/app/views/users/settings/teams/show.html.erb b/app/views/users/settings/teams/show.html.erb index 3d89a65eb..f36e122f1 100644 --- a/app/views/users/settings/teams/show.html.erb +++ b/app/views/users/settings/teams/show.html.erb @@ -93,7 +93,7 @@
      + data-modal-id="team-invite-users-modal"> <%= t("users.settings.teams.edit.add_user") %> @@ -137,4 +137,5 @@ <%= render partial: 'users/settings/user_teams/destroy_user_team_modal.html.erb' %> <%= stylesheet_link_tag 'datatables' %> <%= javascript_include_tag 'users/settings/teams/show' %> +<%= javascript_include_tag 'users/settings/teams/invite_users_modal' %> diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index d8c70c289..f5fc0767e 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -28,6 +28,8 @@ Rails.application.config.assets.precompile += Rails.application.config.assets.precompile += %w(users/settings/teams/add_user_modal.js) Rails.application.config.assets.precompile += %w(users/settings/teams/show.js) +Rails.application.config.assets.precompile += + %w(users/settings/teams/invite_users_modal.js) Rails.application.config.assets.precompile += %w(my_modules/activities.js) Rails.application.config.assets.precompile += %w(my_modules/protocols.js) Rails.application.config.assets.precompile += From 3a5238f6f35c50da0aefd44b66dd82c5f16e4d19 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Mon, 20 Aug 2018 14:26:42 +0200 Subject: [PATCH 05/11] Fix error on activities page when user doesn't have any [SCI-2628] --- app/controllers/activities_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb index fe43522a3..792b5e2cf 100644 --- a/app/controllers/activities_controller.rb +++ b/app/controllers/activities_controller.rb @@ -23,7 +23,7 @@ class ActivitiesController < ApplicationController activities = current_user.last_activities .page(page) .per(Constants::ACTIVITY_AND_NOTIF_SEARCH_LIMIT) - unless activities.last_page? + unless activities.blank? || activities.last_page? more_url = url_for( activities_url( format: :json, From 62d99a43722f21b53c4fcf1909b04667359e946f Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Mon, 20 Aug 2018 14:46:23 +0200 Subject: [PATCH 06/11] Fix report elements sorting [SCI-2654] --- app/views/reports/new/_report_navigation.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/reports/new/_report_navigation.html.erb b/app/views/reports/new/_report_navigation.html.erb index 4d568b8bb..bdda3176d 100644 --- a/app/views/reports/new/_report_navigation.html.erb +++ b/app/views/reports/new/_report_navigation.html.erb @@ -8,8 +8,8 @@
      From 0ed62b7375810f858441077c02cadf5b83b0cde7 Mon Sep 17 00:00:00 2001 From: Zanz2 Date: Tue, 21 Aug 2018 11:35:22 +0200 Subject: [PATCH 07/11] refactored according to PR review --- app/views/protocols/index.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/protocols/index.html.erb b/app/views/protocols/index.html.erb index c069d52d2..7623b1c49 100644 --- a/app/views/protocols/index.html.erb +++ b/app/views/protocols/index.html.erb @@ -70,9 +70,9 @@
    • - <%= link_to "#modal-import-json-protocol", "data-toggle" => "modal" do %> - - + <%= link_to "#modal-import-json-protocol", data: { toggle: 'modal' } do %> + + <% end %>
    From 92a4a54ae7a3dbb456e678870ee23f983529d5c8 Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Tue, 21 Aug 2018 16:46:47 +0200 Subject: [PATCH 08/11] Slighty change the parameter parsing of removed file cells --- .../javascripts/repositories/forms/repository_item_edit.js | 5 ++++- app/controllers/repository_rows_controller.rb | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/repositories/forms/repository_item_edit.js b/app/assets/javascripts/repositories/forms/repository_item_edit.js index acb2b1cce..0a36e2d9e 100644 --- a/app/assets/javascripts/repositories/forms/repository_item_edit.js +++ b/app/assets/javascripts/repositories/forms/repository_item_edit.js @@ -115,6 +115,7 @@ RepositoryItemEditForm.prototype.parseToFormObject = function(tableID, selectedRecord) { var formData = this.formData; var formDataObj = new FormData(); + var removeFileColumns = []; formDataObj.append('request_url', $(tableID).data('current-uri')); formDataObj.append('repository_row_id', $(selectedRecord).attr('id')); @@ -132,7 +133,8 @@ if($el.attr('type') === 'file') { // handle deleting of element if($el.attr('remove') === "true") { - formDataObj.append('repository_cells[' + colId + ']', 'remove'); + removeFileColumns.push(colId); + formDataObj.append('repository_cells[' + colId + ']', null); } else { formDataObj.append('repository_cells[' + colId + ']', getFileValue($el)); @@ -142,6 +144,7 @@ } } }); + formDataObj.append('remove_file_columns', JSON.stringify(removeFileColumns)); return formDataObj; } /** diff --git a/app/controllers/repository_rows_controller.rb b/app/controllers/repository_rows_controller.rb index 084a0d9df..942634b2f 100644 --- a/app/controllers/repository_rows_controller.rb +++ b/app/controllers/repository_rows_controller.rb @@ -134,7 +134,7 @@ class RepositoryRowsController < ApplicationController existing.delete end elsif existing.value_type == 'RepositoryAssetValue' - existing.value.destroy && next if value == 'remove' + existing.value.destroy && next if remove_file_columns_params.include?(key) if existing.value.asset.update(file: value) existing.value.asset.created_by = current_user existing.value.asset.last_modified_by = current_user @@ -365,6 +365,10 @@ class RepositoryRowsController < ApplicationController params.permit(repository_cells: {}).to_h[:repository_cells] end + def remove_file_columns_params + JSON.parse(params.fetch(:remove_file_columns) { '[]' }) + end + def selected_params params.permit(selected_rows: []).to_h[:selected_rows] end From 0322316d74eb1b7a9844370cd361a85c1641ddb1 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Fri, 24 Aug 2018 12:11:28 +0200 Subject: [PATCH 09/11] Make API V1 togglable [SCI-2686] --- app/services/api.rb | 2 ++ config/initializers/api.rb | 2 ++ config/routes.rb | 6 ++++-- spec/rails_helper.rb | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/services/api.rb b/app/services/api.rb index 589cc0275..a06f328be 100644 --- a/app/services/api.rb +++ b/app/services/api.rb @@ -16,12 +16,14 @@ module Api attr_accessor :core_api_token_ttl attr_accessor :core_api_token_iss attr_accessor :azure_ad_apps + attr_accessor :core_api_v1_preview def initialize @core_api_sign_alg = 'HS256' @core_api_token_ttl = 30.minutes @core_api_token_iss = 'SciNote' @azure_ad_apps = {} + @core_api_v1_preview = false end end end diff --git a/config/initializers/api.rb b/config/initializers/api.rb index 4ab3e3898..cad116bbf 100644 --- a/config/initializers/api.rb +++ b/config/initializers/api.rb @@ -9,6 +9,8 @@ Api.configure do |config| config.core_api_token_iss = ENV['CORE_API_TOKEN_ISS'] end + config.core_api_v1_preview = true if ENV['CORE_API_V1_PREVIEW'] + vars = ENV.select { |name, _| name =~ /^[[:alnum:]]*_AZURE_AD_APP_ID/ } vars.each do |name, value| app_name = name.sub('_AZURE_AD_APP_ID', '') diff --git a/config/routes.rb b/config/routes.rb index ddca6879a..785cd4805 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -540,8 +540,10 @@ Rails.application.routes.draw do get 'health', to: 'api#health' get 'status', to: 'api#status' post 'auth/token', to: 'api#authenticate' - namespace :v1 do - resources :teams, only: %i(index show) do + if Api.configuration.core_api_v1_preview + namespace :v1 do + resources :teams, only: %i(index show) do + end end end end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 79e319489..1f74b4ae3 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -5,6 +5,9 @@ require 'database_cleaner' require 'devise' require_relative 'support/controller_macros' ENV['RAILS_ENV'] = 'test' + +ENV['CORE_API_V1_PREVIEW'] = 'true' + require File.expand_path('../../config/environment', __FILE__) # Prevent database truncation if the environment is production abort('The Rails environment is running in production mode!') if Rails.env.production? From b71c5d14c65ca34766cb87daa0e1536f6405ffaf Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Fri, 24 Aug 2018 17:11:59 +0200 Subject: [PATCH 10/11] Fix bootstrap-select to work with turbolinks 5.x This was causing invite users modal, among other things, to not function correctly after visiting another redirect within SciNote using Turbolinks 5.x. Closes SCI-2707. --- app/assets/javascripts/application.js.erb | 7 ++++++- .../users/settings/teams/invite_users_modal.js | 9 ++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb index ab967548e..1e39e67a1 100644 --- a/app/assets/javascripts/application.js.erb +++ b/app/assets/javascripts/application.js.erb @@ -262,4 +262,9 @@ var HelperModule = (function(){ $('.modal').modal('hide'); }); }); -})(); + + /* Fix .selectpicker (bootstrap-select) to work with Turbolinks 5.x */ + $(document).on('turbolinks:load', function() { + $(window).trigger('load.bs.select.data-api'); + }); +})(); \ No newline at end of file diff --git a/app/assets/javascripts/users/settings/teams/invite_users_modal.js b/app/assets/javascripts/users/settings/teams/invite_users_modal.js index 51cd11c53..638d2c330 100644 --- a/app/assets/javascripts/users/settings/teams/invite_users_modal.js +++ b/app/assets/javascripts/users/settings/teams/invite_users_modal.js @@ -173,8 +173,11 @@ }); } - $('[data-role=invite-users-modal]').each(function() { - initializeModal($(this)); + $(document).on('turbolinks:load', function() { + $('[data-role=invite-users-modal]').each(function() { + initializeModal($(this)); + }); + + initializeModalsToggle(); }); - initializeModalsToggle(); }()); From fcf947e29b215540e0666999dadd795479629ada Mon Sep 17 00:00:00 2001 From: Luka Murn Date: Wed, 29 Aug 2018 11:02:44 +0200 Subject: [PATCH 11/11] Update VERSION to 1.14.4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4ea8ad87e..4e00d0ac0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.14.3 +1.14.4