From a2d8285f35c08e72b4b7e01c772c55f11062ccef Mon Sep 17 00:00:00 2001 From: zmagod Date: Mon, 16 Apr 2018 09:22:10 +0200 Subject: [PATCH] fixes archive button but [fixes SCI-2300] --- app/assets/stylesheets/themes/scinote.scss | 2 +- app/controllers/projects_controller.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index 53423bdee..7e9b05d18 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -256,7 +256,7 @@ a[data-toggle="tooltip"] { } ul.nav { - margin-right: 0; + margin-right: 60px; & > li { text-transform: uppercase; diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 9e76748d7..f97ff8387 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -5,15 +5,15 @@ class ProjectsController < ApplicationController include InputSanitizeHelper before_action :generate_intro_demo, only: :index - before_action :load_vars, only: [:show, :edit, :update, - :notifications, :reports, - :samples, :experiment_archive, - :delete_samples, :samples_index] - before_action :load_projects_by_teams, only: %i(index show samples) + before_action :load_vars, only: %i(show edit update + notifications reports + samples experiment_archive + delete_samples samples_index) + before_action :load_projects_by_teams, only: %i(index show samples archive) before_action :check_view_permissions, only: %i(show reports notifications samples experiment_archive samples_index) - before_action :check_create_permissions, only: [ :new, :create ] + before_action :check_create_permissions, only: %i(new create) before_action :check_manage_permissions, only: :edit @filter_by_archived = false