From 15975eaaf739804bb458911c5bd7ab1fc6f0fc22 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Thu, 17 Nov 2016 15:06:31 +0100
Subject: [PATCH] Fixed issue#428 - Switching storage provider for attachments
 in UI has no effect.

---
 .../_settings/area_storage_provider.coffee    |  2 ++
 .../views/settings/storage_provider.jst.eco   | 22 ++++++++++++++
 .../settings/ticket_hook_position.jst.eco     |  3 +-
 ...0003_store_config_name_update_issue_428.rb | 30 +++++++++++++++++++
 db/seeds.rb                                   |  8 +++--
 5 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/javascripts/app/controllers/_settings/area_storage_provider.coffee
 create mode 100644 app/assets/javascripts/app/views/settings/storage_provider.jst.eco
 create mode 100644 db/migrate/20161117000003_store_config_name_update_issue_428.rb

diff --git a/app/assets/javascripts/app/controllers/_settings/area_storage_provider.coffee b/app/assets/javascripts/app/controllers/_settings/area_storage_provider.coffee
new file mode 100644
index 000000000..cd49fefd9
--- /dev/null
+++ b/app/assets/javascripts/app/controllers/_settings/area_storage_provider.coffee
@@ -0,0 +1,2 @@
+class App.SettingsAreaStorageProvider extends App.SettingsAreaItem
+  template: 'settings/storage_provider'
diff --git a/app/assets/javascripts/app/views/settings/storage_provider.jst.eco b/app/assets/javascripts/app/views/settings/storage_provider.jst.eco
new file mode 100644
index 000000000..eaddccd4c
--- /dev/null
+++ b/app/assets/javascripts/app/views/settings/storage_provider.jst.eco
@@ -0,0 +1,22 @@
+<form class="settings-entry" id="<%= @setting.name %>">
+  <h2><%- @T(@setting.title) %></h2>
+  <p class="help-text"><%- @T('You can switch between the backend for new attachments even on a system that is already in production without any loss of data.') %></p>
+  <p class="help-text"><%- @T('If you want to move already stored attachments from one backend to another, you need to execute the following via console.') %></p>
+  </p>
+  <p class="help-text"><%- @T('Move all from "%s" to "%s"', 'filesystem', 'database') %>:</p>
+  </p>
+  <code>
+  rails&gt; Store::File.move('File', 'DB')
+  </code>
+  <p class="help-text"><%- @T('Move all from "%s" to "%s"', 'database', 'filesystem') %>:</p>
+  </p>
+  <code>
+  rails&gt; Store::File.move('DB', 'File')
+  </code>
+  <br>
+  <br>
+  <div class="horizontal end">
+    <div class="form-item flex"></div>
+    <button type="submit" class="btn btn--primary"><%- @T('Submit') %></button>
+  </div>
+</form>
diff --git a/app/assets/javascripts/app/views/settings/ticket_hook_position.jst.eco b/app/assets/javascripts/app/views/settings/ticket_hook_position.jst.eco
index a2a856b1d..be706ce60 100644
--- a/app/assets/javascripts/app/views/settings/ticket_hook_position.jst.eco
+++ b/app/assets/javascripts/app/views/settings/ticket_hook_position.jst.eco
@@ -1,7 +1,6 @@
 <form class="settings-entry" id="<%= @setting.name %>">
   <h2><%- @T(@setting.title) %></h2>
-  <p class="help-text">
-  <%- @T('The format of the subject.') %>
+  <p class="help-text"><%- @T('The format of the subject.') %></p>
   <ul>
     <li><%- @T('|Right| means |Some Subject [Ticket#12345]|') %>
     <li><%- @T('|Left| means |[Ticket#12345] Some Subject|') %>
diff --git a/db/migrate/20161117000003_store_config_name_update_issue_428.rb b/db/migrate/20161117000003_store_config_name_update_issue_428.rb
new file mode 100644
index 000000000..a8146c853
--- /dev/null
+++ b/db/migrate/20161117000003_store_config_name_update_issue_428.rb
@@ -0,0 +1,30 @@
+class StoreConfigNameUpdateIssue428 < ActiveRecord::Migration
+  def up
+    # return if it's a new setup
+    return if !Setting.find_by(name: 'system_init_done')
+    setting = Setting.find_by(name: 'storage')
+    return if !Setting
+    setting.name = 'storage_provider'
+    setting.options = {
+      form: [
+        {
+          display: '',
+          null: true,
+          name: 'storage_provider',
+          tag: 'select',
+          tranlate: true,
+          options: {
+            'DB' => 'Database',
+            'File' => 'Filesystem',
+          },
+        },
+      ],
+    }
+    setting.preferences = {
+      controller: 'SettingsAreaStorageProvider',
+      online_service_disable: true,
+      permission: ['admin.system'],
+    }
+    setting.save!
+  end
+end
diff --git a/db/seeds.rb b/db/seeds.rb
index dfb5db876..b584368de 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -259,7 +259,7 @@ Setting.create_if_not_exists(
 
 Setting.create_if_not_exists(
   title: 'Storage Mechanism',
-  name: 'storage',
+  name: 'storage_provider',
   area: 'System::Storage',
   description: '"Database" stores all attachments in the database (not recommended for storing large amounts of data). "Filesystem" stores the data on the filesystem. You can switch between the modules even on a system that is already in production without any loss of data.',
   options: {
@@ -267,17 +267,19 @@ Setting.create_if_not_exists(
       {
         display: '',
         null: true,
-        name: 'storage',
+        name: 'storage_provider',
         tag: 'select',
+        tranlate: true,
         options: {
           'DB' => 'Database',
-          'FS' => 'Filesystem',
+          'File' => 'Filesystem',
         },
       },
     ],
   },
   state: 'DB',
   preferences: {
+    controller: 'SettingsAreaStorageProvider',
     online_service_disable: true,
     permission: ['admin.system'],
   },