htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor improvement

Browse Source
This commit is contained in:
Hauke Klement
2015-03-10 17:15:13 +01:00
parent fee05a420b
commit 240c570698
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/admin/dashboard_helper.rb
View File

@ -5,7 +5,7 @@ module Admin
end end
def docker_data def docker_data
ExecutionEnvironment.order(:id).select(:id, :permitted_execution_time, :pool_size).map do |execution_environment| ExecutionEnvironment.order(:id).select(:id, :pool_size).map do |execution_environment|
execution_environment.attributes.merge(quantity: DockerContainerPool.quantities[execution_environment.id]) execution_environment.attributes.merge(quantity: DockerContainerPool.quantities[execution_environment.id])
end end
end end

4
app/models/execution_environment.rb
View File

@ -19,8 +19,8 @@ class ExecutionEnvironment < ActiveRecord::Base
validates :run_command, presence: true validates :run_command, presence: true
def set_default_values def set_default_values
self.permitted_execution_time ||= 60 self.permitted_execution_time ||= 60 if has_attribute?(:permitted_execution_time)
self.pool_size ||= 0 self.pool_size ||= 0 if has_attribute?(:pool_size)
end end
private :set_default_values private :set_default_values