Merge branch 'master' of github.com:fh-koeln/LevelPad

th-koeln · Jul 14, 2014 · bd93a3d · bd93a3d
2 parents b77900d + 96fdedb
commit bd93a3d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@
 *.tmp
 *.iml
 *.sass-cache
+Thumbs.db
diff --git a/app/resources/Subjects.js → app/resources/subjects/index.js b/app/resources/Subjects.js → app/resources/subjects/index.js
@@ -1,8 +1,8 @@
 var express = require('express'),
 	subjects = express.Router(),
-	Subject = require('../models/Subject'),
-	Module = require('../models/Module'),
-	helpers = require('./_helpers');
+	Subject = require('../../models/Subject'),
+	Module = require('../../models/Module'),
+	helpers = require('../_helpers');
 require('url');
 
 

diff --git a/config/routes.js b/config/routes.js
@@ -8,7 +8,7 @@ var express = require('express'),
 api.use(acl.middleware);
 
 api.use('/modules', require('../app/resources/modules'));
-api.use('/subjects', require('../app/resources/Subjects'));
+api.use('/subjects', require('../app/resources/subjects'));
 api.use('/users', require('../app/resources/users'));
 
 var routes = express.Router();