From 0d964ee7c7d4f66f3c722f0bcc8eee266988334f Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Wed, 8 Mar 2023 17:14:04 +0100
Subject: [PATCH] admin
---
.../extranets/files_controller.rb | 60 ++++++++++++++++++-
app/models/communication/extranet.rb | 1 +
app/models/communication/extranet/file.rb | 20 ++++++-
.../extranets/files/_form.html.erb | 27 +++++++++
.../extranets/files/_list.html.erb | 36 +++++++++++
.../extranets/files/edit.html.erb | 5 ++
.../extranets/files/index.html.erb | 5 ++
.../extranets/files/new.html.erb | 5 ++
.../extranets/files/show.html.erb | 37 ++++++++++++
.../extranets/posts/_list.html.erb | 2 +-
.../extranets/posts/new.html.erb | 2 +-
.../extranets/posts/show.html.erb | 4 +-
config/locales/communication/en.yml | 7 +++
config/locales/communication/fr.yml | 7 +++
14 files changed, 211 insertions(+), 7 deletions(-)
create mode 100644 app/views/admin/communication/extranets/files/_form.html.erb
create mode 100644 app/views/admin/communication/extranets/files/_list.html.erb
create mode 100644 app/views/admin/communication/extranets/files/edit.html.erb
create mode 100644 app/views/admin/communication/extranets/files/new.html.erb
create mode 100644 app/views/admin/communication/extranets/files/show.html.erb
diff --git a/app/controllers/admin/communication/extranets/files_controller.rb b/app/controllers/admin/communication/extranets/files_controller.rb
index f50d37131..e933b980f 100644
--- a/app/controllers/admin/communication/extranets/files_controller.rb
+++ b/app/controllers/admin/communication/extranets/files_controller.rb
@@ -1,6 +1,64 @@
class Admin::Communication::Extranets::FilesController < Admin::Communication::Extranets::ApplicationController
+ load_and_authorize_resource class: Communication::Extranet::File, through: :extranet
+
def index
breadcrumb
- add_breadcrumb Communication::Extranet.human_attribute_name(:feature_files)
+ end
+
+ def show
+ breadcrumb
+ end
+
+ def new
+ @file.extranet = @extranet
+ breadcrumb
+ end
+
+ def edit
+ breadcrumb
+ add_breadcrumb t('edit')
+ end
+
+ def create
+ @file.extranet = @extranet
+ if @file.save
+ redirect_to admin_communication_extranet_file_path(@file), notice: t('admin.successfully_created_html', model: @file.to_s)
+ else
+ breadcrumb
+ render :new, status: :unprocessable_entity
+ end
+ end
+
+ def update
+ if @file.update(file_params)
+ redirect_to admin_communication_extranet_file_path(@file), notice: t('admin.successfully_updated_html', model: @file.to_s)
+ else
+ breadcrumb
+ add_breadcrumb t('edit')
+ render :edit, status: :unprocessable_entity
+ end
+ end
+
+ def destroy
+ @file.destroy
+ redirect_to admin_communication_extranet_files_url, notice: t('admin.successfully_destroyed_html', model: @file.to_s)
+ end
+
+ protected
+
+ def breadcrumb
+ super
+ add_breadcrumb Communication::Extranet::File.model_name.human(count: 2), admin_communication_extranet_files_path
+ breadcrumb_for @file
+ end
+
+ def file_params
+ params.require(:communication_extranet_file)
+ .permit(
+ :name, :published, :published_at, :slug,
+ )
+ .merge(
+ university_id: current_university.id
+ )
end
end
\ No newline at end of file
diff --git a/app/models/communication/extranet.rb b/app/models/communication/extranet.rb
index b4ee7d812..b8615e505 100644
--- a/app/models/communication/extranet.rb
+++ b/app/models/communication/extranet.rb
@@ -58,6 +58,7 @@ class Communication::Extranet < ApplicationRecord
end
has_many :posts
+ has_many :files
validates_presence_of :name, :host
validates :logo, size: { less_than: 1.megabytes }
diff --git a/app/models/communication/extranet/file.rb b/app/models/communication/extranet/file.rb
index ef92c362b..0c1a33ecf 100644
--- a/app/models/communication/extranet/file.rb
+++ b/app/models/communication/extranet/file.rb
@@ -22,6 +22,22 @@
# fk_rails_af877a8c0c (university_id => universities.id)
#
class Communication::Extranet::File < ApplicationRecord
- belongs_to :university
- belongs_to :extranet
+ include Sanitizable
+ include WithUniversity
+
+ belongs_to :extranet, class_name: 'Communication::Extranet'
+
+ validates :name, presence: true
+
+ before_validation :set_published_at
+
+ def to_s
+ "#{name}"
+ end
+
+ protected
+
+ def set_published_at
+ self.published_at = Time.zone.now if published && published_at.nil?
+ end
end
diff --git a/app/views/admin/communication/extranets/files/_form.html.erb b/app/views/admin/communication/extranets/files/_form.html.erb
new file mode 100644
index 000000000..fa9f2737f
--- /dev/null
+++ b/app/views/admin/communication/extranets/files/_form.html.erb
@@ -0,0 +1,27 @@
+<%= simple_form_for [:admin, file] do |f| %>
+ <%= f.error_notification %>
+ <%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
+
+ <div class="row">
+ <div class="col-md-8">
+ <%= osuny_panel t('content') do %>
+ <%= f.input :name %>
+ <% end %>
+ </div>
+ <div class="col-md-4">
+ <%= osuny_panel t('metadata') do %>
+ <% if can? :publish, file %>
+ <div class="row pure__row--small">
+ <div class="col-6">
+ <%= f.input :published %>
+ </div>
+ </div>
+ <%= f.input :published_at, html5: true, as: :date %>
+ <% end %>
+ <% end %>
+ </div>
+ </div>
+ <% content_for :action_bar_right do %>
+ <%= submit f %>
+ <% end %>
+<% end %>
diff --git a/app/views/admin/communication/extranets/files/_list.html.erb b/app/views/admin/communication/extranets/files/_list.html.erb
new file mode 100644
index 000000000..8e8ed77b4
--- /dev/null
+++ b/app/views/admin/communication/extranets/files/_list.html.erb
@@ -0,0 +1,36 @@
+<div class="table-responsive">
+ <table class="<%= table_classes %>">
+ <thead>
+ <tr>
+ <th class="ps-0" width="60%"><%= Communication::Extranet::File.human_attribute_name('name') %></th>
+ <th colspan="2" class="ps-3"><%= Communication::Extranet::File.human_attribute_name('meta') %></th>
+ </tr>
+ </thead>
+ <tbody>
+ <% files.each do |file| %>
+ <tr <% unless file.published? %>class="draft"<% end %>>
+ <td class="ps-0">
+ <%= link_to file,
+ admin_communication_extranet_file_path(extranet_id: file.extranet.id, id: file.id),
+ class: "#{'draft' unless file.published?}" %>
+ </td>
+ <td class="ps-3 small">
+ <%= l file.published_at, format: :date_with_explicit_month if file.published_at %><br>
+ </td>
+ <td>
+ <div class="btn-group" role="group">
+ <%= link_to t('edit'),
+ edit_admin_communication_extranet_file_path(extranet_id: file.extranet.id, id: file.id),
+ class: button_classes if can?(:update, file) %>
+ <%= link_to t('delete'),
+ admin_communication_extranet_file_path(extranet_id: file.extranet.id, id: file.id),
+ method: :delete,
+ data: { confirm: t('please_confirm') },
+ class: button_classes_danger if can?(:destroy, file) %>
+ </div>
+ </td>
+ </tr>
+ <% end %>
+ </tbody>
+ </table>
+</div>
diff --git a/app/views/admin/communication/extranets/files/edit.html.erb b/app/views/admin/communication/extranets/files/edit.html.erb
new file mode 100644
index 000000000..dff42df32
--- /dev/null
+++ b/app/views/admin/communication/extranets/files/edit.html.erb
@@ -0,0 +1,5 @@
+<% content_for :title, @file %>
+
+<%= render 'admin/communication/extranets/sidebar' do %>
+ <%= render 'form', file: @file %>
+<% end %>
diff --git a/app/views/admin/communication/extranets/files/index.html.erb b/app/views/admin/communication/extranets/files/index.html.erb
index f6d327f00..8e2235db8 100644
--- a/app/views/admin/communication/extranets/files/index.html.erb
+++ b/app/views/admin/communication/extranets/files/index.html.erb
@@ -1,4 +1,9 @@
<% content_for :title, Communication::Extranet.human_attribute_name(:feature_files) %>
<%= render 'admin/communication/extranets/sidebar' do %>
+ <%= render 'admin/communication/extranets/files/list', files: @files %>
+<% end %>
+
+<% content_for :action_bar_right do %>
+ <%= create_link Communication::Extranet::File %>
<% end %>
\ No newline at end of file
diff --git a/app/views/admin/communication/extranets/files/new.html.erb b/app/views/admin/communication/extranets/files/new.html.erb
new file mode 100644
index 000000000..dd83e5e0a
--- /dev/null
+++ b/app/views/admin/communication/extranets/files/new.html.erb
@@ -0,0 +1,5 @@
+<% content_for :title, Communication::Extranet::File.model_name.human %>
+
+<%= render 'admin/communication/extranets/sidebar' do %>
+ <%= render 'form', file: @file %>
+<% end %>
diff --git a/app/views/admin/communication/extranets/files/show.html.erb b/app/views/admin/communication/extranets/files/show.html.erb
new file mode 100644
index 000000000..da0bb3efa
--- /dev/null
+++ b/app/views/admin/communication/extranets/files/show.html.erb
@@ -0,0 +1,37 @@
+<% content_for :title, @file %>
+
+<%= render 'admin/communication/extranets/sidebar' do %>
+ <div class="row">
+ <div class="col-xl-8">
+ </div>
+ <div class="col-xl-4">
+ <%
+ action = ''
+ # action += link_to t('open'),
+ # files_communication_extranet_file_url(@file, host: @file.extranet.url, extranet_id: nil),
+ # target: :_blank,
+ # class: 'btn btn-light btn-xs' if @file.published
+ %>
+ <%= osuny_panel t('metadata'), action: action do %>
+ <div class="row pure__row--small">
+ <div class="col-6">
+ <%= osuny_label Communication::Extranet::File.human_attribute_name('published') %>
+ <p>
+ <%= t @file.published %><% if @file.published & @file.published_at %>,
+ <%= l @file.published_at.to_date, format: :long if @file.published_at %>
+ <% end %>
+ </p>
+ </div>
+ </div>
+ <% end %>
+ </div>
+ </div>
+<% end %>
+
+<% content_for :action_bar_left do %>
+ <%= destroy_link @file %>
+<% end %>
+
+<% content_for :action_bar_right do %>
+ <%= edit_link @file %>
+<% end %>
diff --git a/app/views/admin/communication/extranets/posts/_list.html.erb b/app/views/admin/communication/extranets/posts/_list.html.erb
index 1986fdaa6..15da058e5 100644
--- a/app/views/admin/communication/extranets/posts/_list.html.erb
+++ b/app/views/admin/communication/extranets/posts/_list.html.erb
@@ -25,7 +25,7 @@
edit_admin_communication_extranet_post_path(website_id: post.extranet.id, id: post.id),
class: button_classes if can?(:update, post) %>
<%= link_to t('delete'),
- admin_communication_extranet_post_path(website_id: post.extranet.id, id: post.id),
+ admin_communication_extranet_post_path(extranet_id: post.extranet.id, id: post.id),
method: :delete,
data: { confirm: t('please_confirm') },
class: button_classes_danger if can?(:destroy, post) %>
diff --git a/app/views/admin/communication/extranets/posts/new.html.erb b/app/views/admin/communication/extranets/posts/new.html.erb
index 50458a107..90355fd68 100644
--- a/app/views/admin/communication/extranets/posts/new.html.erb
+++ b/app/views/admin/communication/extranets/posts/new.html.erb
@@ -1,4 +1,4 @@
-<% content_for :title, Communication::Website::Post.model_name.human %>
+<% content_for :title, Communication::Extranet::Post.model_name.human %>
<%= render 'admin/communication/extranets/sidebar' do %>
<%= render 'form', post: @post %>
diff --git a/app/views/admin/communication/extranets/posts/show.html.erb b/app/views/admin/communication/extranets/posts/show.html.erb
index 23b79bbf3..ad9c804d1 100644
--- a/app/views/admin/communication/extranets/posts/show.html.erb
+++ b/app/views/admin/communication/extranets/posts/show.html.erb
@@ -17,7 +17,7 @@
<%= osuny_panel t('metadata'), action: action do %>
<div class="row pure__row--small">
<div class="col-6">
- <%= osuny_label Communication::Website::Post.human_attribute_name('published') %>
+ <%= osuny_label Communication::Extranet::Post.human_attribute_name('published') %>
<p>
<%= t @post.published %><% if @post.published & @post.published_at %>,
<%= l @post.published_at.to_date, format: :long if @post.published_at %>
@@ -29,7 +29,7 @@
<%= osuny_label Communication::Extranet::Post.human_attribute_name('author') %>
<p><%= @post.author %></p>
<% end %>
- <%= osuny_label Communication::Website::Post.human_attribute_name('slug') %>
+ <%= osuny_label Communication::Extranet::Post.human_attribute_name('slug') %>
<p><%= @post.slug %></p>
<% end %>
<%= render 'admin/application/featured_image/show', about: @post %>
diff --git a/config/locales/communication/en.yml b/config/locales/communication/en.yml
index 825d92c18..be1392e10 100644
--- a/config/locales/communication/en.yml
+++ b/config/locales/communication/en.yml
@@ -12,6 +12,9 @@ en:
communication/extranet:
one: Extranet
other: Extranets
+ communication/extranet/file:
+ one: File
+ other: Files
communication/extranet/post:
one: Post
other: Posts
@@ -76,6 +79,10 @@ en:
sso_name_identifier_format: Name Identifier Format
sso_target_url: Target URL
terms: Terms of service
+ communication/extranet/file:
+ name: Name
+ published: Published?
+ published_at: Publication date
communication/extranet/post:
author: Author
featured_image: Featured image
diff --git a/config/locales/communication/fr.yml b/config/locales/communication/fr.yml
index 6880c09c0..168db765e 100644
--- a/config/locales/communication/fr.yml
+++ b/config/locales/communication/fr.yml
@@ -12,6 +12,9 @@ fr:
communication/extranet:
one: Extranet
other: Extranets
+ communication/extranet/file:
+ one: Fichier
+ other: Fichiers
communication/extranet/post:
one: Actualité
other: Actualités
@@ -76,6 +79,10 @@ fr:
sso_name_identifier_format: Name Identifier Format
sso_target_url: URL cible
terms: Conditions d'utilisation
+ communication/extranet/file:
+ name: Nom
+ published: Publié ?
+ published_at: Date de publication
communication/extranet/post:
author: Auteur·rice
featured_image: Image à la une
--
GitLab