Added documentation for the new method added
This commit is contained in:
parent
506b616341
commit
fae5981dc4
3 changed files with 16 additions and 11 deletions
|
|
@ -100,14 +100,6 @@ class Conference < ActiveRecord::Base
|
||||||
# * +false+ -> If the conference dates are not set or today isn't in the
|
# * +false+ -> If the conference dates are not set or today isn't in the
|
||||||
# registration period.
|
# registration period.
|
||||||
# * +true+ -> If today is in the registration period.
|
# * +true+ -> If today is in the registration period.
|
||||||
def registration_dates_given?
|
|
||||||
if self.registration_start_date.blank? || self.registration_end_date.blank?
|
|
||||||
false
|
|
||||||
else
|
|
||||||
true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def registration_open?
|
def registration_open?
|
||||||
today = Date.current
|
today = Date.current
|
||||||
if registration_dates_given?
|
if registration_dates_given?
|
||||||
|
|
@ -116,6 +108,19 @@ class Conference < ActiveRecord::Base
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
##
|
||||||
|
# Checks if the registration dates for the conference are provided
|
||||||
|
#
|
||||||
|
# ====Returns
|
||||||
|
# * +false+ -> If the conference registration dates are not set
|
||||||
|
# * +true+ -> If conference registration dates are set
|
||||||
|
def registration_dates_given?
|
||||||
|
if self.registration_start_date.blank? || self.registration_end_date.blank?
|
||||||
|
false
|
||||||
|
else
|
||||||
|
true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
##
|
##
|
||||||
# Checks if the call for papers for the conference is currently open
|
# Checks if the call for papers for the conference is currently open
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
= content_for :brand do
|
= content_for :brand do
|
||||||
= link_to @conference.title, conference_url(@conference.short_title), class: 'navbar-brand'
|
= link_to @conference.title, conference_url(@conference.short_title), class: 'navbar-brand'
|
||||||
|
|
||||||
%div#program
|
%div#program
|
||||||
= render 'program'
|
= render 'program'
|
||||||
%div#registration
|
%div#registration
|
||||||
= render 'registration'
|
= render 'registration'
|
||||||
%div#callforpapers
|
%div#callforpapers
|
||||||
= render 'call_for_papers'
|
= render 'call_for_papers'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ describe 'conference/show.html.haml' do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'renders program partial' do
|
it 'renders program partial' do
|
||||||
expect(render).to include("#{@conference.description}")
|
expect(rendered).to include("#{@conference.description}")
|
||||||
expect(view).to render_template(partial: 'conference/_program')
|
expect(view).to render_template(partial: 'conference/_program')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -21,6 +21,6 @@ describe 'conference/show.html.haml' do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'renders call_for_papers partial' do
|
it 'renders call_for_papers partial' do
|
||||||
expect(render).to include("#{@conference.call_for_papers.description}")
|
expect(rendered).to include("#{@conference.call_for_papers.description}")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue