/my/settings: fix to work

diff --git a/src/newslash_web/lib/Newslash/Web/Controller/My.pm b/src/newslash_web/lib/Newslash/Web/Controller/My.pm
index 9e21423..a533eb3 100644 (file)
--- a/src/newslash_web/lib/Newslash/Web/Controller/My.pm
+++ b/src/newslash_web/lib/Newslash/Web/Controller/My.pm
@@ -9,6 +9,14 @@ sub messages {
     $c->render(items => $messages);
 };
 
+sub settings {
+    my $c = shift;
+    my $user = $c->stash('user');
+    my $settings = { email => $user->{realemail},
+                   };
+
+    $c->render(current_settings => $settings);
+}
 
 1;
 

diff --git a/src/newslash_web/public/js/user-settings.js b/src/newslash_web/public/js/user-settings.js
index 2df6ec4..8c26f24 100644 (file)
--- a/src/newslash_web/public/js/user-settings.js
+++ b/src/newslash_web/public/js/user-settings.js
@@ -1,27 +1,37 @@
 /* user-settings.js */
-const userSettings = {};
+var userSettings = {};
 
 userSettings.run = function run (params) {
   var vm;
-  const userConfig = params.userConfig || {};
-  const user = params.user || {};
-  const data = {
+  var userConfig = params.userConfig || {};
+  var userInfo = params.userInfo || {};
+  var currentSettings = params.currentSettings || {};
+  
+  var data = {
     userConfig: userConfig,
-    showConfig: 0,
+    userInfo: userInfo,
     user: user,
+    showConfig: 0,
     message: "",
     messagesSaved: -1,
     messageConfigs: [],
+
+    email: currentSettings.email,
+    newemail: "",
+    currentpw: "",
+    newpw1: "",
+    newpw2: "",
+      
     urls: {
       configSave: "/api/v1/user",
       getMessagesConfig: "/api/v1/user?type=message_config",
     },
   };
 
-  const computed = {};
-  const methods = {
+  var computed = {};
+  var methods = {
     saveConfig: function saveConfig() {
-      const data = {
+      var data = {
         type: "config",
         config: vm.$data.userConfig,
       };
@@ -35,7 +45,7 @@ userSettings.run = function run (params) {
       );
     },
     saveMessagesConfig: function saveConfig() {
-      const data = {
+      var data = {
         type: "message",
         items: vm.$data.messageConfigs,
       };

diff --git a/src/newslash_web/templates/my/settings.html.tt2 b/src/newslash_web/templates/my/settings.html.tt2
index e60b0ca..519fc18 100644 (file)
--- a/src/newslash_web/templates/my/settings.html.tt2
+++ b/src/newslash_web/templates/my/settings.html.tt2
@@ -4,8 +4,8 @@
   <div class="panel">
     <h3>ユーザー情報</h3>
     <form id="profile">
-      <label>ã\83\8fã\83³ã\83\89ã\83«å\90\8dï¼\9a
-        <input id="realname" type="text" name="realname" placeholder="ã\83\8fã\83³ã\83\89ã\83«å\90\8d" v-model="userConfig.realname" />
+      <label>å\90\8då\89\8dï¼\9a
+        <input id="realname" type="text" name="realname" placeholder="å\90\8då\89\8d" v-model="userConfig.realname" />
       </label>
 
       <label>ホームページ：
@@ -31,7 +31,7 @@
       <div class="alert alert-warning">メールアドレスの変更にはメールによる確認が必要です</div>
 
       <label>現在のメールアドレス：
-        <input id="realemail" type="text" name="realemail" v-model="realemail" placeholder="メールアドレス" disabled="disabled"/>
+        <input id="realemail" type="text" name="realemail" v-model="email" placeholder="メールアドレス" disabled="disabled"/>
       </label>
 
       <label>変更後のメールアドレス：
@@ -90,10 +90,12 @@
         </select>
       </div>
 
+      [%#
       <label>
         <input type="checkbox" id="disable-js" name="disable-js" value="1" v-model="disableJS" />
         JavaScriptを使った動的なコメント表示を利用しない
       </label>
+      %]
 
       <label>
         <input type="checkbox" id="enable-hotkey" name="enable-hotkey" value="1" v-model="userConfig.enable_hotkey" />
@@ -188,10 +190,10 @@
 [% helpers.load_js("user-settings.js") %]
 [%# <script src="/js/user-settings.js" ></script> %]
 <script>
-  editor.run({
+  userSettings.run({
   el: '#user-settings',
   userConfig: userConfig,
-  user: user,
+  currentSettings: [% current_settings.json() %],
   });
 </script>