codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 08:08:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed #728.

Browse source
This commit is contained in:
Nick Winter 2014-03-28 11:02:23 -07:00
parent 62867534a7
commit ff7e2d5d47
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/templates/editor/level/add_thangs.jade
View file

@ -1,5 +1,5 @@
h3(data-i18n="editor.level_tab_thangs_add") Add Thangs h3(data-i18n="editor.level_tab_thangs_add") Add Thangs
input(type="text", id="thang-search") input(type="search", id="thang-search")
#thangs-list #thangs-list
for group in groups for group in groups
h4= group.name h4= group.name

2
app/views/editor/level/thangs_tab_view.coffee
View file

@ -21,7 +21,7 @@ componentOriginals =
"physics.Physical" : "524b75ad7fc0f6d519000001" "physics.Physical" : "524b75ad7fc0f6d519000001"
class ThangTypeSearchCollection extends CocoCollection class ThangTypeSearchCollection extends CocoCollection
url: '/db/thang.type/search?project=true' url: '/db/thang.type/search?project=original,name,version,slug,kind,components'
model: ThangType model: ThangType
module.exports = class ThangsTabView extends View module.exports = class ThangsTabView extends View

17
server/commons/Handler.coffee
View file

@ -2,6 +2,8 @@ async = require 'async'
mongoose = require('mongoose') mongoose = require('mongoose')
Grid = require 'gridfs-stream' Grid = require 'gridfs-stream'
errors = require './errors' errors = require './errors'
log = require 'winston'
PROJECT = {original:1, name:1, version:1, description: 1, slug:1, kind: 1} PROJECT = {original:1, name:1, version:1, description: 1, slug:1, kind: 1}
FETCH_LIMIT = 150 FETCH_LIMIT = 150
@ -99,6 +101,17 @@ module.exports = class Handler
filters = [{filter: {index: true}}] filters = [{filter: {index: true}}]
if @modelClass.schema.uses_coco_permissions and req.user if @modelClass.schema.uses_coco_permissions and req.user
filters.push {filter: {index: req.user.get('id')}} filters.push {filter: {index: req.user.get('id')}}
projection = null
if req.query.project is 'true'
projection = PROJECT
else if req.query.project
if @modelClass.className is 'User'
projection = PROJECTION
log.warn "Whoa, we haven't yet thought about public properties for User projection yet."
else
projection = {}
for field in req.query.project.split(',')
projection[field] = 1
for filter in filters for filter in filters
callback = (err, results) => callback = (err, results) =>
return @sendDatabaseError(res, err) if err return @sendDatabaseError(res, err) if err
@ -111,11 +124,11 @@ module.exports = class Handler
res.send matchedObjects res.send matchedObjects
res.end() res.end()
if term if term
filter.project = PROJECT if req.query.project filter.project = projection
@modelClass.textSearch term, filter, callback @modelClass.textSearch term, filter, callback
else else
args = [filter.filter] args = [filter.filter]
args.push PROJECT if req.query.project args.push projection if projection
@modelClass.find(args...).limit(FETCH_LIMIT).exec callback @modelClass.find(args...).limit(FETCH_LIMIT).exec callback
versions: (req, res, id) -> versions: (req, res, id) ->