Merge pull request #44 from SpringRoll/161-fixes

1.6.1 fixes

Author: chipbell4

app/models/user.js

@@ -100,7 +100,7 @@ UserSchema.virtual('privilege').get(function()
 	if (this.groups)
 	{
 		var privileges = this.groups.map(group => group.privilege);
-		var highestPriority = Math.max(privileges);
+		var highestPriority = Math.max.apply(Math, privileges);
 		if (highestPriority)
 		{
 			return highestPriority;

app/routes/releases/release.js

@@ -63,8 +63,7 @@ router.delete('/:commit_id', function(req, res)
 					return handleError(err);
 				}
 				req.flash('success', 'Deleted release');
-				let release = await Release.getByCommitId(req.body.commitId);
-				let game = await Game.getById(release.game);
+				let game = await Game.getBySlug(req.body.game);
 				let baseUrl = '';
 				if (!game.isArchived){
 					baseUrl = '/games';

app/views/games/release.jade

@@ -42,6 +42,7 @@ append gameContent
 				.col-sm-9.col-sm-offset-3.text-center
 					input(type="hidden" name="updatedBy" value=user._id)
 					input(type="hidden" name="release" value=release._id)
+					input(type="hidden" name="game" value=game.slug)
 					button.btn.btn-lg.btn-primary(type="submit" name="action" value="PATCH") Update
 					|  
 					button.btn.btn-lg.btn-danger(data-toggle="confirm" type="submit" name="action" value="DELETE") Delete

app/views/home.jade

@@ -11,7 +11,7 @@ append content
 			.row
 				for game in games
 					.col-md-3.col-sm-4.col-xs-6
-						a.game(data-toggle="tooltip" title=game.title href="/games/game/#{game.slug}")
+						a.game(data-toggle="tooltip" title=game.title href="/games/#{game.slug}")
 							if game.thumbnail && game.thumbnail.length
 								img.preview(src="data:image/png;base64,#{game.thumbnail}")
 							else

scripts/updateArchived.js

@@ -0,0 +1,26 @@
+// Load Environment
+const dotenv = require('dotenv');
+dotenv.load();
+
+var mongoose = require('mongoose');
+
+// Attempt to connect to database
+mongoose.connect(process.env.MONGO_DATABASE, function()
+{
+  console.log('Connected to db.');
+  mongoose.connection.db.collection('games').update(
+    {},
+    {$set: {
+       isArchived: false
+      }
+    },
+    {multi: true}
+  );
+  console.log('Active games have been updated.');
+  mongoose.connection.db.collection('gamearchives').find({}).forEach(game => {
+    game.isArchived = true;
+    mongoose.connection.db.collection('games').insert(game);
+  });
+  console.log('Archived games transferred.');
+  return;
+});