From f58bdefbb72b2b9d3eff9349a3d450f7a9450a60 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Thu, 20 Oct 2016 09:05:06 +0000
Subject: [PATCH] [erp5_web_renderjs_ui] Simplify logout page code

---
 .../rjs_gadget_erp5_pt_logoutform_js.js       | 50 ++++---------------
 .../rjs_gadget_erp5_pt_logoutform_js.xml      |  4 +-
 2 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.js
index 41418ddbc5..0e7bc2d9ae 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.js
@@ -1,24 +1,9 @@
-/*global window, rJS, RSVP, promiseEventListener, UriTemplate */
+/*global window, rJS, UriTemplate */
 /*jslint indent: 2, maxerr: 3, nomen: true */
-(function (window, rJS, RSVP, promiseEventListener, UriTemplate) {
+(function (window, rJS, UriTemplate) {
   "use strict";
 
   rJS(window)
-    /////////////////////////////////////////////////////////////////
-    // ready
-    /////////////////////////////////////////////////////////////////
-    // Init local properties
-    .ready(function (g) {
-      g.props = {};
-    })
-
-    // Assign the element to a variable
-    .ready(function (g) {
-      return g.getElement()
-        .push(function (element) {
-          g.props.element = element;
-        });
-    })
     /////////////////////////////////////////////////////////////////
     // handle acquisition
     /////////////////////////////////////////////////////////////////
@@ -33,35 +18,20 @@
     /////////////////////////////////////////////////////////////////
      .declareMethod("render", function () {
       var gadget = this;
-      return new RSVP.Queue()
-        .push(function () {
-          return gadget.updateHeader({page_title: 'Logout'});
-        })
+      return gadget.updateHeader({page_title: 'Logout'})
         .push(function () {
-          return gadget.translateHtml(gadget.props.element.innerHTML);
+          return gadget.translateHtml(gadget.element.innerHTML);
         })
         .push(function (my_translated_html) {
-          gadget.props.element.innerHTML = my_translated_html;
+          gadget.element.innerHTML = my_translated_html;
         });
     })
-    .declareService(function () {
+
+    .onEvent('submit', function () {
       var gadget = this,
         logout_url_template;
-      // Listen to form submit
-      return new RSVP.Queue()
-        .push(function () {
-          return promiseEventListener(
-            gadget.props.element.querySelector('form'),
-            'submit',
-            false
-          );
-        })
-        .push(function () {
-          return gadget.jio_getAttachment(
-            'acl_users',
-            'links'
-          );
-        })
+
+      return gadget.jio_getAttachment('acl_users', 'links')
         .push(function (links) {
           logout_url_template = links._links.logout.href;
           return gadget.getUrlFor({
@@ -79,4 +49,4 @@
           });
         });
     });
-}(window, rJS, RSVP, promiseEventListener, UriTemplate));
\ No newline at end of file
+}(window, rJS, UriTemplate));
\ No newline at end of file
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.xml
index 331c1477a5..c1e6a45ab9 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_logoutform_js.xml
@@ -230,7 +230,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>952.53322.52034.23569</string> </value>
+                <value> <string>954.47195.16803.17902</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -248,7 +248,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1469543750.01</float>
+                        <float>1476953978.0</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
-- 
2.30.9