diff --git a/app/controllers/admin/university/organizations_controller.rb b/app/controllers/admin/university/organizations_controller.rb index 328dd0b54760db15c2bf10fde44ee78e6b6e6411..d1b34c072c421d1c1e02181d29c6b60f364c82f8 100644 --- a/app/controllers/admin/university/organizations_controller.rb +++ b/app/controllers/admin/university/organizations_controller.rb @@ -15,6 +15,12 @@ class Admin::University::OrganizationsController < Admin::University::Applicatio breadcrumb end + def static + @about = @organization + @website = @organization.websites&.first + render layout: false + end + def new breadcrumb end diff --git a/app/models/university/organization.rb b/app/models/university/organization.rb index bfc568b5f51d4c7a3fa330c8e555011699db9087..5fc78ebb21d9344a8aa8b4beceead7691b77bbb5 100644 --- a/app/models/university/organization.rb +++ b/app/models/university/organization.rb @@ -36,6 +36,7 @@ class University::Organization < ApplicationRecord include WithBlobs include WithUniversity include WithSlug + include WithBlocks has_many :experiences, class_name: 'University::Person::Experience' diff --git a/app/models/university/person.rb b/app/models/university/person.rb index a3f3f3e10ab70d333719afd964d9aea4782818b5..91b4c2648b28f1cecee633e54aa47161703551ac 100644 --- a/app/models/university/person.rb +++ b/app/models/university/person.rb @@ -55,6 +55,7 @@ class University::Person < ApplicationRecord include WithSlug include WithPicture include WithRoles + include WithBlocks LIST_OF_ROLES = [ :administration, diff --git a/app/views/admin/university/organizations/show.html.erb b/app/views/admin/university/organizations/show.html.erb index ffeb2b8be14bd7cc40330c45bcc3cce89a6894bf..d78932e5316c11c90fd97b1db54d3350e1149bff 100644 --- a/app/views/admin/university/organizations/show.html.erb +++ b/app/views/admin/university/organizations/show.html.erb @@ -74,6 +74,7 @@ </div> </div> </div> + <%= render 'admin/communication/blocks/list', about: @organization %> </div> <div class="col-md-4"> <div class="card flex-fill w-100"> @@ -144,6 +145,10 @@ <% content_for :action_bar_left do %> <%= destroy_link @organization %> + <%= link_to t('static'), + static_admin_university_organization_path(@organization), + target: :_blank, + class: button_classes('btn-light') if current_user.server_admin? %> <% end %> <% content_for :action_bar_right do %> diff --git a/app/views/admin/university/organizations/static.html.erb b/app/views/admin/university/organizations/static.html.erb index 39002994caa3627343e26207672261bc4d7149f6..6d79a23f7d32dfe67aff16938e1dd3f6547358a3 100644 --- a/app/views/admin/university/organizations/static.html.erb +++ b/app/views/admin/university/organizations/static.html.erb @@ -18,5 +18,6 @@ logo: "<%= @about.logo.blob.id %>" <% end %> description: > <%= prepare_text_for_static @about.description %> +<%= render 'admin/communication/blocks/static', about: @about %> --- <%= prepare_html_for_static @about.text, @about.university %> diff --git a/app/views/admin/university/people/_main_infos.html.erb b/app/views/admin/university/people/_main_infos.html.erb index 0693e24ce25716d7279acf0f0d8becf8fd36037e..7cf40ec7ee120522ba65357cb6e82b32f57acba1 100644 --- a/app/views/admin/university/people/_main_infos.html.erb +++ b/app/views/admin/university/people/_main_infos.html.erb @@ -61,6 +61,7 @@ </div> </div> <% end %> + <%= render 'admin/communication/blocks/list', about: person %> </div> <div class="col-md-4 col-xl-3"> <div class="card flex-fill w-100"> diff --git a/app/views/admin/university/people/static.html.erb b/app/views/admin/university/people/static.html.erb index 24d2039ec892e5351bc3c3dd3fdaa5431d3f4578..a49e305b599777e451f18271afbac95eb0595fc9 100644 --- a/app/views/admin/university/people/static.html.erb +++ b/app/views/admin/university/people/static.html.erb @@ -63,5 +63,6 @@ administrative_missions: <%= target.path_in_website(@website) if target.respond_to? :path_in_website %> <% end %> <% end %> +<%= render 'admin/communication/blocks/static', about: @about %> --- <%= prepare_html_for_static @about.biography, @about.university %> diff --git a/config/routes/admin/university.rb b/config/routes/admin/university.rb index ce33420c960d8d6c8f639facec80eb197496f8ff..9f4701b020e53948e53488e8dc791f93254913a3 100644 --- a/config/routes/admin/university.rb +++ b/config/routes/admin/university.rb @@ -24,5 +24,9 @@ namespace :university do get :static end end - resources :organizations + resources :organizations do + member do + get :static + end + end end