From a2a3f8a11b20fd25523a73196e3bbd3be9eeaffa Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Thu, 6 Jul 2023 15:02:36 +0200
Subject: [PATCH] climate
---
.../extranets/contacts_controller.rb | 35 ++++++++++---------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/app/controllers/admin/communication/extranets/contacts_controller.rb b/app/controllers/admin/communication/extranets/contacts_controller.rb
index 52fe1c4f5..3a822b27c 100644
--- a/app/controllers/admin/communication/extranets/contacts_controller.rb
+++ b/app/controllers/admin/communication/extranets/contacts_controller.rb
@@ -11,22 +11,7 @@ class Admin::Communication::Extranets::ContactsController < Admin::Communication
.ordered
.page(params[:organizations_page])
}
- format.xlsx {
- # params[export] can be "people" oe "organizations"
- export = params['export']
- case params['export']
- when 'people'
- @people = @extranet.connected_people.ordered
- when 'organizations'
- @organizations = @extranet.connected_organizations.ordered
- else
- raise ActionController::RoutingError.new('Not Found')
- end
-
- filename = "#{export}-#{Time.now.strftime("%Y%m%d%H%M%S")}.xlsx"
- response.headers['Content-Disposition'] = "attachment; filename=#{filename}"
- render "admin/university/#{export}/index"
- }
+ format.xlsx { export }
end
@@ -54,7 +39,6 @@ class Admin::Communication::Extranets::ContactsController < Admin::Communication
head :ok
end
-
protected
def load_object
@@ -62,4 +46,21 @@ class Admin::Communication::Extranets::ContactsController < Admin::Communication
object_id = params[:objectId]
@object = object_type.constantize.find object_id
end
+
+ def export
+ # params[export] can be "people" or "organizations"
+ export = params['export']
+ case params['export']
+ when 'people'
+ @people = @extranet.connected_people.ordered
+ when 'organizations'
+ @organizations = @extranet.connected_organizations.ordered
+ else
+ raise ActionController::RoutingError.new('Not Found')
+ end
+
+ filename = "#{export}-#{Time.now.strftime("%Y%m%d%H%M%S")}.xlsx"
+ response.headers['Content-Disposition'] = "attachment; filename=#{filename}"
+ render "admin/university/#{export}/index"
+ end
end
--
GitLab