From 50c230ba1e31ef6de0a504be47a9d032c013a5ff Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 15 Feb 2013 16:28:38 -0500
Subject: [PATCH] for some reason closure-accessible db causes the
 multi-downlaod issue??

---
 src/server/serverRoutes.coffee | 3 +--
 views/app/index.html           | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/server/serverRoutes.coffee b/src/server/serverRoutes.coffee
index 1dc27a4dad..3d0e6a8f8d 100644
--- a/src/server/serverRoutes.coffee
+++ b/src/server/serverRoutes.coffee
@@ -1,7 +1,6 @@
 scoring = require('../app/scoring')
 _ = require('underscore')
 icalendar = require('icalendar')
-db = require('mongoskin').db(process.env.NODE_DB_URI, {safe:true})
 
 module.exports = (expressApp, root, derby) ->
 
@@ -21,7 +20,7 @@ module.exports = (expressApp, root, derby) ->
 #    model = req.getModel()
 #    query = model.query('users').withIdAndToken(uid, apiToken)
 #    model.fetch query, (err, result) ->
-    db.collection('users').find({_id:uid, apiToken:apiToken}).toArray (err, result) ->
+    require('mongoskin').db(process.env.NODE_DB_URI, {safe:true}).collection('users').find({_id:uid, apiToken:apiToken}).toArray (err, result) ->
       return res.send(500, err) if err
 #      tasks = result.at(0).get('tasks')
       tasks = result[0].tasks
diff --git a/views/app/index.html b/views/app/index.html
index 2d18de7ae0..182c73f20e 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -341,8 +341,7 @@ do a find for the string after "→"
               <a x-bind=click:toggleChart data-toggle-id="todos-chart" data-history-path="_user.history.todos" rel=tooltip title="Progress"><i class=icon-signal></i></a>
             {/}
             &nbsp;<a href="/v1/users/{{_user.id}}/calendar.ics?apiToken={{_user.apiToken}}"><img src='/img/calendar_ical.png' title="iCal" alt="iCal" rel=tooltip /></a>
-            <!-- comment out gcal until we can get it working -->
-            <!--&nbsp;<a target="_blank" href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}"><img src='/img/calendar_google.png' title="Google Calendar" alt="Google Calendar" rel=tooltip /></a>-->
+            &nbsp;<a target="_blank" href="https://www.google.com/calendar/render?cid={{encodeiCalLink(_user.id, _user.apiToken)}}"><img src='/img/calendar_google.png' title="Google Calendar" alt="Google Calendar" rel=tooltip /></a>
         </span>
         <div id="todos-chart" style="display:none;"></div>
         <ul class="nav nav-tabs">