From e885524768d67c83d447d0c26bb2e9f349dda806 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Fri, 15 Apr 2022 21:06:09 +0200
Subject: [PATCH] home
---
.../extranet/academic_years_controller.rb | 2 +-
app/controllers/extranet/cohorts_controller.rb | 2 +-
app/controllers/extranet/home_controller.rb | 3 ++-
app/controllers/extranet/persons_controller.rb | 2 +-
app/views/extranet/home/index.html.erb | 15 ++++++++++++---
5 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/app/controllers/extranet/academic_years_controller.rb b/app/controllers/extranet/academic_years_controller.rb
index ae8af0b8c..5b7d80d9b 100644
--- a/app/controllers/extranet/academic_years_controller.rb
+++ b/app/controllers/extranet/academic_years_controller.rb
@@ -4,7 +4,7 @@ class Extranet::AcademicYearsController < Extranet::ApplicationController
through_association: :academic_years
def index
- @academic_years = current_context.about&.academic_years || @academic_years
+ @academic_years = current_extranet.about&.academic_years || @academic_years
breadcrumb
end
diff --git a/app/controllers/extranet/cohorts_controller.rb b/app/controllers/extranet/cohorts_controller.rb
index 7ff9e380d..e25c966f2 100644
--- a/app/controllers/extranet/cohorts_controller.rb
+++ b/app/controllers/extranet/cohorts_controller.rb
@@ -4,7 +4,7 @@ class Extranet::CohortsController < Extranet::ApplicationController
through_association: :education_cohorts
def index
- @cohorts = current_context.about&.cohorts || @cohorts
+ @cohorts = current_extranet.about&.cohorts || @cohorts
breadcrumb
end
diff --git a/app/controllers/extranet/home_controller.rb b/app/controllers/extranet/home_controller.rb
index 6c0971380..d0b22af8f 100644
--- a/app/controllers/extranet/home_controller.rb
+++ b/app/controllers/extranet/home_controller.rb
@@ -1,6 +1,7 @@
class Extranet::HomeController < Extranet::ApplicationController
def index
redirect_to admin_root_path unless current_extranet
- @cohorts = current_university.education_cohorts.ordered.limit(2)
+ @cohorts = current_extranet.about&.cohorts || current_university.education_cohorts
+ @cohorts = @cohorts.ordered.limit(5)
end
end
diff --git a/app/controllers/extranet/persons_controller.rb b/app/controllers/extranet/persons_controller.rb
index c674dbb34..172fc4473 100644
--- a/app/controllers/extranet/persons_controller.rb
+++ b/app/controllers/extranet/persons_controller.rb
@@ -4,7 +4,7 @@ class Extranet::PersonsController < Extranet::ApplicationController
through_association: :people
def index
- @people = current_context.about&.alumni || @people.alumni
+ @people = current_extranet.about&.alumni || @people.alumni
breadcrumb
end
diff --git a/app/views/extranet/home/index.html.erb b/app/views/extranet/home/index.html.erb
index d2c5b6045..3a6a045cb 100644
--- a/app/views/extranet/home/index.html.erb
+++ b/app/views/extranet/home/index.html.erb
@@ -1,5 +1,14 @@
<% content_for :title, current_context %>
-<h2><%= Education::Cohort.model_name.human(count: 2) %></h2>
-<p><%= link_to 'Voir toutes les promotions', education_cohorts_path %></p>
-<%= render 'extranet/cohorts/list', cohorts: @cohorts %>
+<div class="row">
+ <div class="col-md-8">
+
+ </div>
+ <div class="col-md-4">
+ <h2>Promotions actuelles</h2>
+ <p><%= link_to 'Voir toutes les promotions', education_cohorts_path %></p>
+ <% @cohorts.each do |cohort| %>
+ <%= link_to cohort, cohort %><br>
+ <% end %>
+ </div>
+</div>
--
GitLab