show course-categories, without parents of subcategories

Openki · Aug 6, 2013 · 68ff7ae · 68ff7ae
1 parent 1163e03
commit 68ff7ae
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/client/views/courses/details/course.edit.js b/client/views/courses/details/course.edit.js
@@ -29,7 +29,7 @@ Template.course_edit.checked = function(id, cats) {
 
 
 Template.course_edit.show_subcats = function(id, cats) {
-	if (cats === undefined) return;
+	if (cats === undefined) return 'none';
 	if (cats.length) {
 		return cats.indexOf(id) >= 0 ? 'block' : 'none'
 	} else {

diff --git a/client/views/courses/details/course.show_categories.js b/client/views/courses/details/course.show_categories.js
@@ -1,4 +1,17 @@
 
 Template.show_categories.loadcategories = function(categories) {
-	return Categories.find({_id: {$in: categories}})
+	//return Categories.find({_id: {$in: categories}});
+
+	var allSubCats = Categories.find({_id: {$in: categories}, parent: {$gte:1}});
+	var subCatParents = new Array();
+	var count = 0;
+
+	allSubCats.forEach(function (subCat) {
+	  subCatParents[count] = subCat.parent;
+      count += 1;
+    }); 
+
+    //returns all categories, without parents of subcategories.
+	return Categories.find({_id: {$in: categories, $nin: subCatParents}});
+
 }