scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-05 22:44:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1095 from ZmagoD/zd_SCI_2300

Browse source 
fixes archive button [fixes SCI-2300]
This commit is contained in:
Zmago Devetak 2018-04-16 16:19:21 +02:00 committed by GitHub
commit f90589d714
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/themes/scinote.scss
View file

@ -256,7 +256,7 @@ a[data-toggle="tooltip"] {
}
ul.nav {
margin-right: 0;
margin-right: 60px;
& > li {
text-transform: uppercase;

12
app/controllers/projects_controller.rb
View file

@ -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