gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added registration segment to display description, period

Browse source 
Controller test for Conference#show

houndci fixes

Rebased with single entry for navigation branding

Conditional rendering of splash navbar
This commit is contained in:
Gopesh Tulsyan 2014-05-28 18:12:45 +05:30
parent 25a56097c5
commit abfb0884a1
6 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/conference.rb
View file

@ -9,7 +9,7 @@ class Conference < ActiveRecord::Base
:questions_attributes, :question_ids, :answers_attributes, :answer_ids,
:difficulty_levels_attributes, :use_difficulty_levels,
:use_vpositions, :use_vdays, :vdays_attributes, :vpositions_attributes, :use_volunteers,
:media_id, :media_type, :color, :description
:media_id, :media_type, :color, :description, :registration_description
has_paper_trail
@ -74,7 +74,7 @@ class Conference < ActiveRecord::Base
# Checks if the user is registered to the conference
#
# ====Args
# * +user+ -> The user we check for
# * +user+ -> The user we check for
# ====Returns
# * +nil+ -> If the user doesn't exist
# * +false+ -> If the user is registered