consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor budget's phase max description lenght from Budget to Phase model

Browse Source
This commit is contained in:
Bertocq
2018-01-15 19:55:41 +01:00
parent 36e74d0ef2
commit f2228a908b
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/budget.rb
View File

@@ -41,10 +41,6 @@ class Budget < ActiveRecord::Base
send("description_#{phase}").try(:html_safe) send("description_#{phase}").try(:html_safe)
end end
def self.description_max_length
2000
end
def self.title_max_length def self.title_max_length
80 80
end end

3
app/models/budget/phase.rb
View File

@@ -1,5 +1,6 @@
class Budget class Budget
class Phase < ActiveRecord::Base class Phase < ActiveRecord::Base
DESCRIPTION_MAX_LENGTH = 2000
belongs_to :budget belongs_to :budget
belongs_to :next_phase, class_name: 'Budget::Phase', foreign_key: :next_phase_id belongs_to :next_phase, class_name: 'Budget::Phase', foreign_key: :next_phase_id
@@ -7,7 +8,7 @@ class Budget
validates :budget, presence: true validates :budget, presence: true
validates :kind, presence: true, uniqueness: { scope: :budget }, inclusion: { in: Budget::PHASES } validates :kind, presence: true, uniqueness: { scope: :budget }, inclusion: { in: Budget::PHASES }
validates :description, length: { maximum: Budget.description_max_length } validates :description, length: { maximum: DESCRIPTION_MAX_LENGTH }
validate :dates_range_valid? validate :dates_range_valid?
scope :enabled, -> { where(enabled: true) } scope :enabled, -> { where(enabled: true) }

2
app/views/admin/budgets/_form.html.erb
View File

@@ -4,7 +4,7 @@
<% Budget::PHASES.each do |phase| %> <% Budget::PHASES.each do |phase| %>
<div class="margin-top"> <div class="margin-top">
<%= f.cktext_area "description_#{phase}", maxlength: Budget.description_max_length, ckeditor: { language: I18n.locale } %> <%= f.cktext_area "description_#{phase}", maxlength: Budget::Phase::DESCRIPTION_MAX_LENGTH, ckeditor: { language: I18n.locale } %>
</div> </div>
<% end %> <% end %>