sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-01 07:21:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

for some reason closure-accessible db causes the multi-downlaod issue??

Browse source
This commit is contained in:
Tyler Renelle 2013-02-15 16:28:38 -05:00
parent c41a950793
commit 50c230ba1e
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/server/serverRoutes.coffee
View file

@ -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

3
views/app/index.html
View file

@ -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">