diff --git a/Gemfile.lock b/Gemfile.lock index 608f486d1..de64f2123 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -603,7 +603,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.3.3) + rdoc (6.3.4.1) recaptcha (5.14.0) regexp_parser (2.8.1) responders (3.1.1) diff --git a/VERSION b/VERSION index b01d4e4b5..359c41089 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.31.0.1 +1.32.0 diff --git a/app/assets/images/scinote_logo.png b/app/assets/images/scinote_logo.png new file mode 100644 index 000000000..3cbc3b73a Binary files /dev/null and b/app/assets/images/scinote_logo.png differ diff --git a/app/assets/javascripts/sitewide/comments_sidebar.js b/app/assets/javascripts/sitewide/comments_sidebar.js index c53344523..d6a35193a 100644 --- a/app/assets/javascripts/sitewide/comments_sidebar.js +++ b/app/assets/javascripts/sitewide/comments_sidebar.js @@ -31,7 +31,6 @@ var CommentsSidebar = (function() { // Replace the number in comment element commentsCounter.text(commentsCounter.text().replace(/[\d\\+]+/g, commentsAmount)); commentsCounter.removeClass('hidden'); - commentsCounter.css('display', 'flex'); } } diff --git a/app/assets/stylesheets/protocol_management.scss b/app/assets/stylesheets/protocol_management.scss index 0c2b76fad..ac6d24cb4 100644 --- a/app/assets/stylesheets/protocol_management.scss +++ b/app/assets/stylesheets/protocol_management.scss @@ -22,20 +22,6 @@ } } -.btn-beta-icon { - &::after { - background-color: var(--sn-coral); - border-radius: 1px; - color: var(--sn-white); - content: "BETA"; - font-size: .5rem; - left: 7rem; - padding: .125rem .25rem; - position: absolute; - top: .1rem; - } -} - .dropdown-menu { border: 0; } diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 140c3327d..c960766f9 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -74,6 +74,7 @@ class ProjectsController < ApplicationController end def update + default_public_user_role_name_before_update = @project.default_public_user_role&.name @project.assign_attributes(project_update_params) return_error = false flash_error = t('projects.update.error_flash', name: escape_input(@project.name)) @@ -127,7 +128,7 @@ class ProjectsController < ApplicationController log_activity(:project_remove_access_from_all_team_members, @project, { visibility: message_visibility, - role: @project.default_public_user_role.name, + role: default_public_user_role_name_before_update, team: @project.team.id }) end diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb index 1f9955ec3..b86cd8ce0 100644 --- a/app/controllers/protocols_controller.rb +++ b/app/controllers/protocols_controller.rb @@ -129,13 +129,13 @@ class ProtocolsController < ApplicationController project_folder = record.my_module.experiment.project.project_folder { - my_module_name: record.my_module.name, - experiment_name: record.my_module.experiment.name, - project_name: record.my_module.experiment.project.name, + my_module_name: record.my_module.name_with_label, + experiment_name: record.my_module.experiment.name_with_label, + project_name: record.my_module.experiment.project.name_with_label, my_module_url: protocols_my_module_path(record.my_module), experiment_url: my_modules_path(experiment_id: record.my_module.experiment.id), project_url: experiments_path(project_id: record.my_module.experiment.project.id), - project_folder_name: project_folder.present? ? project_folder.name : nil, + project_folder_name: project_folder.present? ? project_folder.name_with_label : nil, project_folder_url: project_folder.present? ? project_folder_projects_url(project_folder) : nil } }, diff --git a/app/javascript/vue/experiments/card.vue b/app/javascript/vue/experiments/card.vue index cdef030bf..0a1be59ab 100644 --- a/app/javascript/vue/experiments/card.vue +++ b/app/javascript/vue/experiments/card.vue @@ -1,11 +1,12 @@