Merge pull request #2556 from esparta/promote_new_installation_page
Use New Install within their own template
This commit is contained in:
commit
9734120845
3 changed files with 4 additions and 3 deletions
|
|
@ -8,6 +8,9 @@ class ConferencesController < ApplicationController
|
||||||
def index
|
def index
|
||||||
@current = Conference.where('end_date >= ?', Date.current).reorder(start_date: :asc)
|
@current = Conference.where('end_date >= ?', Date.current).reorder(start_date: :asc)
|
||||||
@antiquated = Conference.where('end_date < ?', Date.current)
|
@antiquated = Conference.where('end_date < ?', Date.current)
|
||||||
|
if @antiquated.empty? && @current.empty? && User.empty?
|
||||||
|
render :new_install
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,6 @@
|
||||||
#antiquated.collapse
|
#antiquated.collapse
|
||||||
- @antiquated.each do |conference|
|
- @antiquated.each do |conference|
|
||||||
= render '/conferences/conference_details', conference: conference
|
= render '/conferences/conference_details', conference: conference
|
||||||
- if @antiquated.empty? && @current.empty? && User.empty?
|
|
||||||
= render partial: 'new_install'
|
|
||||||
|
|
||||||
-content_for :script_body do
|
-content_for :script_body do
|
||||||
:javascript
|
:javascript
|
||||||
|
|
|
||||||
|
|
@ -17,5 +17,5 @@
|
||||||
will the be administrator of it.
|
will the be administrator of it.
|
||||||
%p
|
%p
|
||||||
We hope you enjoy using OSEM, if you have any question don't hesitate to
|
We hope you enjoy using OSEM, if you have any question don't hesitate to
|
||||||
= link_to('http://osem.io/#contact') do
|
= link_to('https://osem.io/#contact') do
|
||||||
contact us!
|
contact us!
|
||||||
Loading…
Add table
Add a link
Reference in a new issue