minor

iliakan · iliakan · commit 47cc33b2f9af · 2015-05-05T08:36:54.000+03:00
diff --git a/edit b/edit
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-TUTORIAL_ROOT=/js/javascript-tutorial gulp edit
+TUTORIAL_ROOT=/js/javascript-tutorial gulp --harmony_classes edit
 
diff --git a/handlers/courses/controller/coursesByUser.js b/handlers/courses/controller/coursesByUser.js
@@ -1,3 +1,7 @@
+"use strict";
+
+const CourseInvite = require('../models/courseInvite');
+const CourseGroup = require('../models/courseGroup');
 
 /**
  * The order form is sent to checkout when it's 100% valid (client-side code validated it)
@@ -6,28 +10,46 @@
  * @param next
  */
 exports.get = function*(next) {
-/*
-  var user = this.params.userById;
 
-  if (String(this.req.user._id) != String(user._id)) {
+  var user = this.userById;
+
+  if (String(this.user._id) != String(user._id)) {
     this.throw(403);
   }
 
-  var orders = yield Order.find({
-    user: user._id,
-    status: {
-      $ne: Order.STATUS_CANCEL
-    }
-  }).sort({created: 1}).populate('user').exec();
+  // active invites
+  var invites = yield CourseInvite.find({
+    email: user.email,
+    accepted: false
+  }).populate('group').exec();
+
+  // plus groups where participates
+  var groups = yield CourseGroup.find({
+    'participants.user': user._id
+  }).exec();
 
-  var ordersToShow = [];
+  this.body = [];
 
-  for (var i = 0; i < orders.length; i++) {
-    var format = require(orders[i].module).formatOrderForProfile;
-    if (!format) continue;
-    ordersToShow.push(yield* format.call(this, orders[i]));
+  for (let i = 0; i < invites.length; i++) {
+    let group = formatGroup(invites[i].group);
+    group.inviteToken = invites[i].token;
+    this.body.push(group);
+  }
+
+  for (let i = 0; i < groups.length; i++) {
+    let group = groups[i];
+    this.body.push(formatGroup(group));
   }
 
-  this.body = ordersToShow;
-*/
 };
+
+function formatGroup(group) {
+  return {
+    title: group.title,
+    groupUrl: group.getUrl(),
+    groupPrivateUrl: group.getPrivateUrl(),
+    dateStart: group.dateStart,
+    dateEnd: group.dateEnd,
+    timeDesc: group.timeDesc
+  };
+}
diff --git a/handlers/courses/models/courseGroup.js b/handlers/courses/models/courseGroup.js
@@ -80,5 +80,10 @@ schema.methods.getUrl = function() {
 };
 
 
+schema.methods.getPrivateUrl = function() {
+  return '/courses/groups/private/' + this.slug;
+};
+
+
 module.exports = mongoose.model('CourseGroup', schema);
 
diff --git a/handlers/payments/common/controller/ordersByUser.js b/handlers/payments/common/controller/ordersByUser.js
@@ -11,9 +11,9 @@ var OrderCreateError = require('../../lib/orderCreateError');
  */
 exports.get = function*(next) {
 
-  var user = this.params.userById;
+  var user = this.userById;
 
-  if (String(this.req.user._id) != String(user._id)) {
+  if (String(this.user._id) != String(user._id)) {
     this.throw(403);
   }
 
diff --git a/handlers/quiz/controllers/resultsByUser.js b/handlers/quiz/controllers/resultsByUser.js
@@ -5,9 +5,9 @@ const User = require('users').User;
 
 exports.get = function*() {
 
-  var user = this.params.userById;
+  var user = this.userById;
 
-  if (String(this.req.user._id) != String(user._id)) {
+  if (String(this.user._id) != String(user._id)) {
     this.throw(403);
   }
 
diff --git a/modules/router.js b/modules/router.js
@@ -21,7 +21,7 @@ function Router() {
       this.throw(404);
     }
 
-    this.params.userById = user;
+    this.userById = user;
 
     yield* next;
   });
diff --git a/nginx/partial/javascript-static b/nginx/partial/javascript-static
@@ -33,8 +33,6 @@ location ~ \.mp4$ {
     mp4;
     mp4_buffer_size       1m;
     mp4_max_buffer_size   5m;
-    mp4_limit_rate        on;
-    mp4_limit_rate_after  30s;
 }
 
 # anything with an extension in basename

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`
`3`		`-TUTORIAL_ROOT=/js/javascript-tutorial gulp edit`
	`3`	`+TUTORIAL_ROOT=/js/javascript-tutorial gulp --harmony_classes edit`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ var OrderCreateError = require('../../lib/orderCreateError');`
`11`	`11`	`*/`
`12`	`12`	`exports.get = function*(next) {`
`13`	`13`
`14`		`- var user = this.params.userById;`
	`14`	`+ var user = this.userById;`
`15`	`15`
`16`		`- if (String(this.req.user._id) != String(user._id)) {`
	`16`	`+ if (String(this.user._id) != String(user._id)) {`
`17`	`17`	`this.throw(403);`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ const User = require('users').User;`
`5`	`5`
`6`	`6`	`exports.get = function*() {`
`7`	`7`
`8`		`- var user = this.params.userById;`
	`8`	`+ var user = this.userById;`
`9`	`9`
`10`		`- if (String(this.req.user._id) != String(user._id)) {`
	`10`	`+ if (String(this.user._id) != String(user._id)) {`
`11`	`11`	`this.throw(403);`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ function Router() {`
`21`	`21`	`this.throw(404);`
`22`	`22`	`}`
`23`	`23`
`24`		`- this.params.userById = user;`
	`24`	`+ this.userById = user;`
`25`	`25`
`26`	`26`	`yield* next;`
`27`	`27`	`});`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,6 @@ location ~ \.mp4$ {`
`33`	`33`	`mp4;`
`34`	`34`	`mp4_buffer_size 1m;`
`35`	`35`	`mp4_max_buffer_size 5m;`
`36`		`- mp4_limit_rate on;`
`37`		`- mp4_limit_rate_after 30s;`
`38`	`36`	`}`
`39`	`37`
`40`	`38`	`# anything with an extension in basename`