TeamController -> CollectiveController, team-member-profile -> teacher-profile; team.js -> collective.js

This commit is contained in:
tmshv committed 2016-02-24 20:58:19 +03:00
1 parent f40f164e4d
commit 8031d83f56
13 files changed
+85 -196

No files matched your search

+6 -3
View File
@@ -1,13 +1,16 @@
import route from 'koa-route';
import {index, json} from './';
import {sortByPattern} from '../utils/sort';
import db from '../core/db';
import {getCourseNameByID} from '../models/course';
import team from '../models/team';
let split = d => s => s.split(d);
let toArray = split(',');
export default function () {
return route.get('/collective', json(
function *() {
this.type = 'application/json';
let pattern = toArray(this.query.sort || '');
let data = yield db.c('collective').find();
if (!data) {
@@ -15,7 +18,7 @@ export default function () {
return;
}
this.body = data;
this.body = sortByPattern(data, pattern, i => i.id);
}
))
};
+6 -6
View File
@@ -7,8 +7,8 @@ var router = require("./");
var db = require("../core/db");
var schedule = require("../models/schedule");
var populate = require("../utils/populate").populate;
import {getCourseNameByID} from "../models/course";
const team = require("../models/team");
//import {getCourseNameByID} from "../models/course";
//const team = require("../models/team");
module.exports = function (app) {
app.use(
@@ -33,10 +33,10 @@ module.exports = function (app) {
}
if(doPopulate) {
data.schedule = schedule.populate(data.schedule, [
populate(team.short, "teacher"),
populate(getCourseNameByID, "lesson")
]);
//data.schedule = schedule.populate(data.schedule, [
// populate(team.short, "teacher"),
// populate(getCourseNameByID, "lesson")
//]);
}
this.body = data;