mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-02-11 01:14:30 +08:00
Merge pull request #531 from okriuchykhin/ok_SCI_1127
Remove logs table and old unused logging code [SCI-1127]
This commit is contained in:
commit
ff919eba92
9 changed files with 5 additions and 78 deletions
|
@ -32,18 +32,6 @@ class ApplicationController < ActionController::Base
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
def log(message)
|
|
||||||
if @my_module
|
|
||||||
@my_module.log(message)
|
|
||||||
elsif @project
|
|
||||||
@project.log(message)
|
|
||||||
elsif @team
|
|
||||||
@team.log(message)
|
|
||||||
else
|
|
||||||
logger.error(message)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_403(style = 'danger')
|
def render_403(style = 'danger')
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html do
|
format.html do
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
class Log < ActiveRecord::Base
|
|
||||||
validates :message, presence: true
|
|
||||||
validates :team, presence: true
|
|
||||||
|
|
||||||
belongs_to :team, inverse_of: :logs
|
|
||||||
end
|
|
|
@ -348,12 +348,6 @@ class MyModule < ActiveRecord::Base
|
||||||
return clone
|
return clone
|
||||||
end
|
end
|
||||||
|
|
||||||
# Writes to user log.
|
|
||||||
def log(message)
|
|
||||||
final = "[%s] %s" % [name, message]
|
|
||||||
experiment.project.log(final)
|
|
||||||
end
|
|
||||||
|
|
||||||
# Find an empty position for the restored module. It's
|
# Find an empty position for the restored module. It's
|
||||||
# basically a first empty row with empty space inside x=[0, 32).
|
# basically a first empty row with empty space inside x=[0, 32).
|
||||||
def get_new_position
|
def get_new_position
|
||||||
|
|
|
@ -160,12 +160,6 @@ class Project < ActiveRecord::Base
|
||||||
st
|
st
|
||||||
end
|
end
|
||||||
|
|
||||||
# Writes to user log.
|
|
||||||
def log(message)
|
|
||||||
final = "[%s] %s" % [name, message]
|
|
||||||
team.log(final)
|
|
||||||
end
|
|
||||||
|
|
||||||
def assigned_samples
|
def assigned_samples
|
||||||
Sample.joins(:my_modules).where(my_modules: {
|
Sample.joins(:my_modules).where(my_modules: {
|
||||||
id: my_modules_ids.split(',')
|
id: my_modules_ids.split(',')
|
||||||
|
|
|
@ -20,7 +20,6 @@ class Team < ActiveRecord::Base
|
||||||
has_many :samples_tables, inverse_of: :team, dependent: :destroy
|
has_many :samples_tables, inverse_of: :team, dependent: :destroy
|
||||||
has_many :sample_groups, inverse_of: :team
|
has_many :sample_groups, inverse_of: :team
|
||||||
has_many :sample_types, inverse_of: :team
|
has_many :sample_types, inverse_of: :team
|
||||||
has_many :logs, inverse_of: :team
|
|
||||||
has_many :projects, inverse_of: :team
|
has_many :projects, inverse_of: :team
|
||||||
has_many :custom_fields, inverse_of: :team
|
has_many :custom_fields, inverse_of: :team
|
||||||
has_many :protocols, inverse_of: :team, dependent: :destroy
|
has_many :protocols, inverse_of: :team, dependent: :destroy
|
||||||
|
@ -71,12 +70,6 @@ class Team < ActiveRecord::Base
|
||||||
.where_attributes_like(attributes, a_query)
|
.where_attributes_like(attributes, a_query)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Writes to user log
|
|
||||||
def log(message)
|
|
||||||
final = "[%s] %s" % [Time.current.to_s, message]
|
|
||||||
logs.create(message: final)
|
|
||||||
end
|
|
||||||
|
|
||||||
# Imports samples into db
|
# Imports samples into db
|
||||||
# -1 == sample_name,
|
# -1 == sample_name,
|
||||||
# -2 == sample_type,
|
# -2 == sample_type,
|
||||||
|
|
5
db/migrate/20170330092353_remove_logs_table.rb
Normal file
5
db/migrate/20170330092353_remove_logs_table.rb
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
class RemoveLogsTable < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
drop_table :logs
|
||||||
|
end
|
||||||
|
end
|
|
@ -1,27 +0,0 @@
|
||||||
require 'test_helper'
|
|
||||||
|
|
||||||
class LogTest < ActiveSupport::TestCase
|
|
||||||
def setup
|
|
||||||
@log = logs(:one)
|
|
||||||
end
|
|
||||||
|
|
||||||
test 'should validate log with valid data' do
|
|
||||||
assert @log.valid?
|
|
||||||
end
|
|
||||||
|
|
||||||
test 'should have non-blank message' do
|
|
||||||
@log.message = ''
|
|
||||||
assert @log.invalid?, 'Log with blank message returns valid? = true'
|
|
||||||
@log.message = nil
|
|
||||||
assert @log.invalid?, 'Log with nil message returns valid? = true'
|
|
||||||
end
|
|
||||||
|
|
||||||
test 'should have team' do
|
|
||||||
@log.team_id = 12321321
|
|
||||||
assert @log.invalid?, 'Log without team returns valid? = true'
|
|
||||||
@log.team = nil
|
|
||||||
assert @log.invalid?, 'Log without team returns valid? = true'
|
|
||||||
@log.team = Team.new
|
|
||||||
assert @log.valid?, 'Log with team returns valid? = false'
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -141,11 +141,4 @@ class MyModuleTest < ActiveSupport::TestCase
|
||||||
test "should deep clone module" do
|
test "should deep clone module" do
|
||||||
skip
|
skip
|
||||||
end
|
end
|
||||||
|
|
||||||
test "should save log message" do
|
|
||||||
message = "This is test message for my module"
|
|
||||||
@my_module.log(message)
|
|
||||||
log_message = Log.last.message
|
|
||||||
assert_equal log_message[57..-1], message
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -32,13 +32,6 @@ class TeamTest < ActiveSupport::TestCase
|
||||||
assert_equal Constants::MINIMAL_TEAM_SPACE_TAKEN, team.space_taken
|
assert_equal Constants::MINIMAL_TEAM_SPACE_TAKEN, team.space_taken
|
||||||
end
|
end
|
||||||
|
|
||||||
test 'should save log message' do
|
|
||||||
message = 'This is test message'
|
|
||||||
@team.log(message)
|
|
||||||
log_message = Log.last.message[26..-1]
|
|
||||||
assert_equal log_message, message
|
|
||||||
end
|
|
||||||
|
|
||||||
test 'should open spreadsheet file' do
|
test 'should open spreadsheet file' do
|
||||||
skip
|
skip
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue