scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-09 13:28:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #72 from ZmagoD/zd_fix_exl_archive

Browse source 
fixed experiments archive bug
This commit is contained in:
Zmago Devetak 2016-08-18 13:16:51 +02:00 • committed by GitHub
commit a680b09cc9
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/experiments_controller.rb
View file

@ -80,9 +80,6 @@ class ExperimentsController < ApplicationController
@experiment.archived = true @experiment.archived = true
@experiment.archived_by = current_user @experiment.archived_by = current_user
@experiment.archived_on = DateTime.now @experiment.archived_on = DateTime.now
@experiment.my_modules.each do |my_module|
my_module.archive(current_user)
end
if @experiment.save if @experiment.save
flash[:success] = t('experiments.archive.success_flash', flash[:success] = t('experiments.archive.success_flash',
experiment: @experiment.name) experiment: @experiment.name)

12
app/models/project.rb
View file

@ -149,12 +149,18 @@ class Project < ActiveRecord::Base
if role.blank? if role.blank?
MyModule.none MyModule.none
elsif role == 'owner' elsif role == 'owner'
project_my_modules.where(archived: false) project_my_modules
.joins(:experiment)
.where('experiments.archived=false')
.where('my_modules.archived=false')
else else
project_my_modules project_my_modules
.joins(:user_my_modules) .joins(:user_my_modules)
.where('user_my_modules.user_id IN (?)', user.id) .joins(:experiment)
.where(archived: false) .where('experiments.archived=false AND user_my_modules.user_id IN (?)',
user.id)
.where('my_modules.archived=false')
.distinct .distinct
end end
end end