[tor-commits] [atlas/master] Replace pool assignment with transport protocols.

[phw at torproject.org]

commit 727455f50d913c2111143eb0e5c2ecabf48e1dad
Author: Philipp Winter <phw at torproject.org>
Date:   Wed Dec 10 18:39:29 2014 +0100

    Replace pool assignment with transport protocols.
    
    The bridge pool assignment field is now deprecated and no longer
    provided by Onionoo.  At the same time, Onionoo now provides a field
    containing a bridge's transport protocols.  This patch makes Atlas show
    the transport protocols instead of the pool assignment.
---
 js/models/relay.js            |    2 +-
 templates/details/bridge.html |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/models/relay.js b/js/models/relay.js
index 1cf7783..ea5c987 100644
--- a/js/models/relay.js
+++ b/js/models/relay.js
@@ -179,7 +179,7 @@ define([
                     relay.downtime = relay.last_seen ? model.parsedate(relay.last_seen).hrfull : null;
                     relay.as_no = relay.as_number ? relay.as_number : null;
                     relay.as_name = relay.as_name ? relay.as_name : null;
-                    relay.pool_assignment = relay.pool_assignment ? relay.pool_assignment : null;
+                    relay.transports = relay.transports ? relay.transports : null;
                     relay.fingerprint = relay.hashed_fingerprint ? relay.hashed_fingerprint : relay.fingerprint;
                     model.set({badexit: false});
                     var size = ['16x16', '14x16', '8x16'];
diff --git a/templates/details/bridge.html b/templates/details/bridge.html
index 1180210..88fefe1 100644
--- a/templates/details/bridge.html
+++ b/templates/details/bridge.html
@@ -55,8 +55,8 @@
     <dt><span class="tip" data-content="What OS and Tor version the bridge is using" data-original-title="Platform">Platform</span></dt>
     <dd><%= _.escape(relay.get('platform')) %></dd>
 
-    <dt><span class="tip" data-content="BridgeDB information assigned to the bridge." data-original-title="Pool Assignment">Pool Assignment</span></dt>
-    <dd><%= relay.get('pool_assignment') %></dd>
+    <dt><span class="tip" data-content="Transport protocols supported by this bridge." data-original-title="Transport protocols">Transport protocols</span></dt>
+    <dd><%= relay.get('transports') %></dd>
 
     </dl>
     </div>