Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

diff --git a/app/assets/javascripts/controllers/users.js.coffee b/app/assets/javascripts/controllers/users.js.coffee
index 598fedb..6f3369a 100644 (file)
--- a/app/assets/javascripts/controllers/users.js.coffee
+++ b/app/assets/javascripts/controllers/users.js.coffee
@@ -1,11 +1,7 @@
 class Pettanr.UsersController extends Pettanr.AppController\r
   \r
   # receive user authoring form data as post\r
-  sign_in: () ->\r
-    @user = new Pettanr.User.Session()\r
-    @listenTo(@user, 'sign_in:success', @sign_in_success)\r
-    @listenTo(@user, 'sign_in:fail', @sign_in_fail)\r
-    @user.save({})\r
+  #sign_in: (attr) ->\r
   \r
   # try getting current user\r
   test: () ->\r

diff --git a/app/assets/javascripts/models/user.js.coffee b/app/assets/javascripts/models/user.js.coffee
index 05b21d6..7d95518 100644 (file)
--- a/app/assets/javascripts/models/user.js.coffee
+++ b/app/assets/javascripts/models/user.js.coffee
@@ -3,7 +3,6 @@ class Pettanr.User extends Backbone.Model
   url: '/users/'\r
   \r
   defaults: {\r
-    id: null\r
   } \r
   \r
   author: () ->\r
@@ -28,7 +27,7 @@ class Pettanr.User.Session extends Pettanr.User
   \r
   destroy: () ->\r
     @url = '/users/sign_out'\r
-    super({\r
+    @sync('delete', this, {\r
       success: (model, response, options) =>\r
         @trigger('sign_out:success', model, response)\r
       error: (model, response, options) =>\r

diff --git a/app/assets/javascripts/views/layout.js.coffee b/app/assets/javascripts/views/layout.js.coffee
index 0a2e35f..281d59c 100644 (file)
--- a/app/assets/javascripts/views/layout.js.coffee
+++ b/app/assets/javascripts/views/layout.js.coffee
@@ -166,8 +166,11 @@ class Pettanr.Views.Layout.Sns extends Pettanr.Views.Layout.Base
     # initial page\r
     super()\r
   \r
-  sign_in: () ->\r
-    \r
+  sign_in: (attr) ->\r
+    @user = new Pettanr.User.Session(attr)\r
+    @listenTo(@user, 'sign_in:success', @sign_in_success)\r
+    @listenTo(@user, 'sign_in:fail', @sign_in_fail)\r
+    @user.save({})\r
   \r
   sign_in_success: (user, response) ->\r
     super(user, response)\r
@@ -180,8 +183,8 @@ class Pettanr.Views.Layout.Sns extends Pettanr.Views.Layout.Base
   \r
   sign_in_fail: (user, response) ->\r
     super(user, response)\r
-    @header_router.navigate('users/guest')\r
-    @local_router.navigate('user_seeeions/new')\r
+    @header.fire({controller: 'users', action: 'guest'})\r
+    @body.fire({controller: 'user_sessions', action: 'new'})\r
   \r
   sign_out: () ->\r
     @header.fire({controller: 'users', action: 'sign_out'})\r
@@ -191,10 +194,10 @@ class Pettanr.Views.Layout.Sns extends Pettanr.Views.Layout.Base
     @global_router.navigate('')\r
     ## navigate users/guest\r
     ## callback from fire to refresh_header\r
-    #@header_router.navigate('users/guest')\r
+    @header.fire({controller: 'users', action: 'guest'})\r
     ## navigate sign in form\r
     ## callback from fire to refresh_body\r
-    #@local_router.navigate('user_sessions/new')\r
+    @body.fire({controller: 'user_sessions', action: 'new'})\r
   \r
   sign_out_fail: (user, response) ->\r
     super(user, response)\r

diff --git a/app/assets/javascripts/views/layouts/sns.js.coffee b/app/assets/javascripts/views/layouts/sns.js.coffee
index ba47f7a..ab073fe 100644 (file)
--- a/app/assets/javascripts/views/layouts/sns.js.coffee
+++ b/app/assets/javascripts/views/layouts/sns.js.coffee
@@ -18,8 +18,8 @@ class Pettanr.Views.Layout.Sns.Header extends Backbone.View
     action_name = params['action']\r
     controller[action_name]()\r
   \r
-  sign_in: () ->\r
-    @trigger('sign_in')\r
+  sign_in: (attr) ->\r
+    @trigger('sign_in', attr)\r
   \r
   sign_in_success: (user, response) ->\r
     @trigger('sign_in:success', user, response)\r
@@ -73,8 +73,8 @@ class Pettanr.Views.Layout.Sns.Body extends Backbone.View
     action_name = params['action']\r
     controller[action_name]()\r
   \r
-  sign_in: () ->\r
-    @trigger('sign_in')\r
+  sign_in: (attr) ->\r
+    @trigger('sign_in', attr)\r
   \r
   sign_in_success: (user, response) ->\r
     @trigger('sign_in:success', user, response)\r
@@ -98,6 +98,7 @@ class Pettanr.Views.Layout.Sns.Body extends Backbone.View
     @listenTo(view, 'navigate', @navigate)\r
     @listenTo(view, 'post', @post)\r
     @listenTo(view, 'put', @put)\r
+    @listenTo(view, 'sign_in', @sign_in)\r
     this.$el.html(view.render().el)\r
   \r
   navigate: (url) ->\r

diff --git a/app/assets/javascripts/views/user_sessions/new.js.coffee b/app/assets/javascripts/views/user_sessions/new.js.coffee
index ffb880d..4a500f0 100644 (file)
--- a/app/assets/javascripts/views/user_sessions/new.js.coffee
+++ b/app/assets/javascripts/views/user_sessions/new.js.coffee
@@ -15,11 +15,6 @@ class Pettanr.Views.UserSeeeion.New extends Backbone.View
   sign_in: () ->\r
     m = $('#user_email').val()\r
     p = $('#user_password').val()\r
-    user = new Pettanr.User.Current()\r
-    user.save({user: {email: m, password: p}}, (current_user) ->\r
-      r = new Pettanr.Views.Top.Account({operators: window.operators})\r
-      $('#account').html(r.render().el)\r
-      window.router.home()\r
-    )\r
+    @trigger('sign_in', {user: {email: m, password: p}})\r
     return false\r
   \r

diff --git a/app/assets/javascripts/views/users/guest.js.coffee b/app/assets/javascripts/views/users/guest.js.coffee
index 9725521..ca24f79 100644 (file)
--- a/app/assets/javascripts/views/users/guest.js.coffee
+++ b/app/assets/javascripts/views/users/guest.js.coffee
@@ -15,7 +15,7 @@ class Pettanr.Views.User.Guest extends Backbone.View
       class_name: 'sign_in', \r
       content: 'sign in'\r
     })\r
-    @listenTo(sign_in, 'click', @sign_out_click)\r
+    @listenTo(sign_in, 'click', @sign_in_click)\r
     this.$el.append(sign_in.render().el)\r
     this\r
   \r

diff --git a/public/local_manifest.json b/public/local_manifest.json
index c84f4a7..107bb42 100644 (file)
--- a/public/local_manifest.json
+++ b/public/local_manifest.json
@@ -2076,6 +2076,12 @@
           },\r
           "row_break": true\r
         },\r
+        "visible": {\r
+          "tag": {\r
+            "type": "select"\r
+          },\r
+          "row_break": true\r
+        },\r
         "description": {\r
           "label": {\r
             "args": {\r
@@ -2084,11 +2090,6 @@
           },\r
           "tag": {\r
             "type": "text_area"\r
-          }\r
-        },\r
-        "visible": {\r
-          "tag": {\r
-            "type": "select"\r
           },\r
           "row_break": true\r
         },\r
@@ -2111,8 +2112,8 @@
       },\r
       "field_names": [\r
         "title",\r
-        "description",\r
         "visible",\r
+        "description",\r
         "id",\r
         "author_id"\r
       ]\r
@@ -2163,6 +2164,12 @@
           },\r
           "row_break": true\r
         },\r
+        "visible": {\r
+          "tag": {\r
+            "type": "select"\r
+          },\r
+          "row_break": true\r
+        },\r
         "description": {\r
           "label": {\r
             "args": {\r
@@ -2171,11 +2178,6 @@
           },\r
           "tag": {\r
             "type": "text_area"\r
-          }\r
-        },\r
-        "visible": {\r
-          "tag": {\r
-            "type": "select"\r
           },\r
           "row_break": true\r
         },\r
@@ -2198,8 +2200,8 @@
       },\r
       "field_names": [\r
         "title",\r
-        "description",\r
         "visible",\r
+        "description",\r
         "id",\r
         "author_id"\r
       ]\r
@@ -2250,6 +2252,12 @@
           },\r
           "row_break": true\r
         },\r
+        "visible": {\r
+          "tag": {\r
+            "type": "select"\r
+          },\r
+          "row_break": true\r
+        },\r
         "description": {\r
           "label": {\r
             "args": {\r
@@ -2261,12 +2269,6 @@
           },\r
           "row_break": true\r
         },\r
-        "visible": {\r
-          "tag": {\r
-            "type": "select"\r
-          },\r
-          "row_break": true\r
-        },\r
         "id": {\r
           "label": {\r
             "type": "none"\r
@@ -2286,8 +2288,8 @@
       },\r
       "field_names": [\r
         "title",\r
-        "description",\r
         "visible",\r
+        "description",\r
         "id",\r
         "author_id"\r
       ]\r