From cb4ba86bac734181072f300773bd93c2f37cfe6a Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Wed, 13 Jan 2016 15:22:25 +0530
Subject: [PATCH] use peering request

---
 static/js/folders.js     | 12 ++++--------
 static/js/peersButton.js | 27 ++++++++++++++-------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/static/js/folders.js b/static/js/folders.js
index 98222a8..b31a905 100644
--- a/static/js/folders.js
+++ b/static/js/folders.js
@@ -347,15 +347,11 @@ oml.ui.folders = function() {
             Ox.print('got change event')
             Ox.Request.clearCache();
         },
-        'peering.accept': function(data) {
-            Ox.print('peering.accept reload list')
+        peering: function(data, event) {
             Ox.Request.clearCache('getUsers');
-            that.updateElement();
-        },
-        'peering.remove': function(data) {
-            Ox.print('peering.remove reload list')
-            Ox.Request.clearCache('getUsers');
-            that.updateElement();
+            if (Ox.contains(['peering.accept', 'peering.remove'], event)) {
+                that.updateElement();
+            }
         },
         status: function(data) {
             if (data.id == oml.user.id) {
diff --git a/static/js/peersButton.js b/static/js/peersButton.js
index 8185c6c..b9f02a3 100644
--- a/static/js/peersButton.js
+++ b/static/js/peersButton.js
@@ -39,25 +39,26 @@ oml.ui.peersButton = function() {
         .appendTo(that);
 
     oml.bindEvent({
-        'peering.request': update,
-        'peering.accept': update,
-        'peering.reject': update
+        peering: update
     });
     update();
 
     function open() {
-        oml.UI.set({page: 'users'});
+        oml.UI.set({page: 'peers'});
     }
     function update() {
-        oml.api.getUsers(function(result) {
-            requests = result.data.users.filter(function(user) {
-                return user.pending=="received";
-            }).length;
-            count.html(requests);
-            that.options({
-                tooltip: Ox._(requests
-                    ? Ox.formatCount(requests, 'peering request')
-                    : 'No peering requests')
+        // wait for clearCache in folder.js
+        setTimeout(function() {
+            oml.api.getUsers(function(result) {
+                requests = result.data.users.filter(function(user) {
+                    return user.pending=="received";
+                }).length;
+                count.html(requests);
+                that.options({
+                    tooltip: Ox._(requests
+                        ? Ox.formatCount(requests, 'peering request')
+                        : 'No peering requests')
+                });
             });
         });
     }