Merge branch 'master' into 0000-docker

1 files changed, 11 insertions, 0 deletions

diff --git a/app/controllers/development_toolbar_controller.rb b/app/controllers/development_toolbar_controller.rb
new file mode 100644
index 000000000..20349f7b8
--- /dev/null
+++ b/app/controllers/development_toolbar_controller.rb
@@ -0,0 +1,11 @@
+class DevelopmentToolbarController < ApplicationController
+  def update_settings
+    return unless Rails.application.config.development_toolbar.present?
+    organisation = current_user.organisation
+    organisation.features = params[:features].keys.select{|k| params[:features][k] == "true"}
+    organisation.save
+    current_user.permissions = params[:permissions].keys.select{|k| params[:permissions][k] == "true"}
+    current_user.save
+    redirect_to request.referrer || "/"
+  end
+end