From e474cda03ab964e13dc11a7204d95f8b2333a7bd Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Wed, 28 Jun 2017 16:44:47 +0200 Subject: [PATCH 1/3] Fix activities [SCI-1412] --- app/assets/javascripts/application.js.erb | 1 - app/controllers/activities_controller.rb | 2 +- app/controllers/users/invitations_controller.rb | 2 +- app/models/activity.rb | 5 ++--- config/initializers/paperclip.rb | 1 + 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb index 240899728..fcea01b3b 100644 --- a/app/assets/javascripts/application.js.erb +++ b/app/assets/javascripts/application.js.erb @@ -60,7 +60,6 @@ function initFormSubmitLinks(el) { } /* Enable loading bars */ -Turbolinks.enableProgressBar(); $(document) .bind("ajaxSend", function(){ animateLoading(); diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb index 3db73616c..29629df31 100644 --- a/app/controllers/activities_controller.rb +++ b/app/controllers/activities_controller.rb @@ -1,7 +1,7 @@ class ActivitiesController < ApplicationController include ActivityHelper - before_filter :load_vars + before_action :load_vars def index @per_page = Constants::ACTIVITY_AND_NOTIF_SEARCH_LIMIT diff --git a/app/controllers/users/invitations_controller.rb b/app/controllers/users/invitations_controller.rb index 21cf02977..bd199cd7a 100644 --- a/app/controllers/users/invitations_controller.rb +++ b/app/controllers/users/invitations_controller.rb @@ -7,7 +7,7 @@ module Users before_action :check_invite_users_permission, only: :invite_users - before_filter :update_sanitized_params, only: :update + before_action :update_sanitized_params, only: :update def update # Instantialize a new team with the provided name diff --git a/app/models/activity.rb b/app/models/activity.rb index 683639219..e4dd2d029 100644 --- a/app/models/activity.rb +++ b/app/models/activity.rb @@ -64,12 +64,11 @@ class Activity < ApplicationRecord ] validates :type_of, presence: true - validates :project, :user, presence: true - belongs_to :project, inverse_of: :activities, optional: true + belongs_to :project, inverse_of: :activities belongs_to :experiment, inverse_of: :activities, optional: true belongs_to :my_module, inverse_of: :activities, optional: true - belongs_to :user, inverse_of: :activities, optional: true + belongs_to :user, inverse_of: :activities private diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 7fdc8322f..c219e0a51 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -35,6 +35,7 @@ if ENV['PAPERCLIP_STORAGE'] == "s3" original: :private, medium: :private }, + s3_region: ENV['AWS_REGION'], s3_storage_class: { medium: :reduced_redundancy, thumb: :reduced_redundancy, From 16a68bbaee773ef122dc5bca4dfeda3f859d3382 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Wed, 28 Jun 2017 17:02:37 +0200 Subject: [PATCH 2/3] Fix hound [SCI-1412] --- config/initializers/paperclip.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index c219e0a51..7fdc8322f 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -35,7 +35,6 @@ if ENV['PAPERCLIP_STORAGE'] == "s3" original: :private, medium: :private }, - s3_region: ENV['AWS_REGION'], s3_storage_class: { medium: :reduced_redundancy, thumb: :reduced_redundancy, From 5c39b90b2d2cdf647f59b8df46e3ad19029e1d88 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Fri, 30 Jun 2017 16:33:52 +0200 Subject: [PATCH 3/3] Fix activities button misbehaviour with turbolinks [SCI-1412] --- app/assets/javascripts/application.js.erb | 43 --------------------- app/assets/javascripts/navigation.js | 47 +++++++++++++++++++++++ 2 files changed, 47 insertions(+), 43 deletions(-) diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb index fcea01b3b..c235a5032 100644 --- a/app/assets/javascripts/application.js.erb +++ b/app/assets/javascripts/application.js.erb @@ -177,49 +177,6 @@ $(window).unload(function () { $(window).unbind('unload'); }); -$(document.body).ready(function () { - // Activity feed modal in main navigation menu - var activityModal = $('#activity-modal'); - var activityModalBody = activityModal.find('.modal-body'); - - var initMoreBtn = function () { - activityModalBody.find('.btn-more-activities') - .on('ajax:success', function (e, data) { - $(data.html).insertBefore($(this).parents('li')); - $(this).attr('href', data.next_url); - if (data.activities_number < data.per_page) { - $(this).remove(); - } - }); - }; - - notificationAlertClose(); - - $('#main-menu .btn-activity') - .on('ajax:before', function () { - activityModal.modal('show'); - }) - .on('ajax:success', function (e, data) { - activityModalBody.html(data.html); - initMoreBtn(); - }); - - activityModal.on('hidden.bs.modal', function () { - activityModalBody.html(''); - }); -}); - -$(document).ajaxComplete(function(){ - notificationAlertClose(); -}); - -function notificationAlertClose(){ - $("#notifications .alert").on("closed.bs.alert", function () { - $("#content-wrapper") - .addClass("alert-hidden") - .removeClass("alert-shown"); - }); -} var HelperModule = (function(){ var helpers = {}; diff --git a/app/assets/javascripts/navigation.js b/app/assets/javascripts/navigation.js index bce30d4ad..4b19db7cc 100644 --- a/app/assets/javascripts/navigation.js +++ b/app/assets/javascripts/navigation.js @@ -104,10 +104,57 @@ }); } + function initActivitiesButton() { + $(document.body).ready(function() { + // Activity feed modal in main navigation menu + var activityModal = $('#activity-modal'); + var activityModalBody = activityModal.find('.modal-body'); + + var initMoreBtn = function() { + activityModalBody.find('.btn-more-activities') + .on('ajax:success', function(e, data) { + $(data.html).insertBefore($(this).parents('li')); + $(this).attr('href', data.next_url); + if (data.activities_number < data.per_page) { + $(this).remove(); + } + }); + }; + + notificationAlertClose(); + + $('#main-menu .btn-activity') + .on('ajax:before', function() { + activityModal.modal('show'); + }) + .on('ajax:success', function(e, data) { + activityModalBody.html(data.html); + initMoreBtn(); + }); + + activityModal.on('hidden.bs.modal', function() { + activityModalBody.html(''); + }); + }); + + $(document).ajaxComplete(function() { + notificationAlertClose(); + }); + + function notificationAlertClose() { + $('#notifications .alert').on('closed.bs.alert', function() { + $('#content-wrapper') + .addClass('alert-hidden') + .removeClass('alert-shown'); + }); + } + } + // init loadDropdownNotifications(); loadUnseenNotificationsNumber(); toggleNotificationBellPosition(); focusSearchInput(); initGlobalSwitchForm(); + initActivitiesButton(); })();