Merge pull request #7 from smallhacks/dev

Merge Dev to Master
smallhacks · Aug 22, 2018 · 4bbfc8f · 4bbfc8f
2 parents ec913cf + 0d73e86
commit 4bbfc8f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/src/client/templates/index/index_student.js b/src/client/templates/index/index_student.js
@@ -99,7 +99,7 @@ Template.indexStudent.helpers({
 		}
 	},
 	publicSpaces: function() {
-		return Spaces.find({permissions:{public:true}});
+		return Spaces.find({"permissions.public":true});
 	},
   	isLangSelected: function(lang) {
   		if (Session.get('lang')) {
@@ -109,7 +109,10 @@ Template.indexStudent.helpers({
 			if (lang == langSelected)
 	  			return 'selected';
 	  	}
-	  }
+	},
+	isBox: function() {
+		return (Meteor.settings.public.isBox === "true")
+	}
 });
 
 
diff --git a/src/client/templates/index/index_teacher.js b/src/client/templates/index/index_teacher.js
@@ -118,7 +118,7 @@ Template.indexTeacher.helpers({
 		return Spaces.find({userId:Meteor.userId()}, {sort: {submitted: -1}});
 	},
 	publicSpaces: function() {
-		return Spaces.find({permissions:{public:true}});
+		return Spaces.find({"permissions.public":true});
 	},
   	isLangSelected: function(lang) {
   		if (Session.get('lang')) {

diff --git a/src/private/version.json b/src/private/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.26c"
+  "version": "1.26e"
 }
diff --git a/src/server/publications.js b/src/server/publications.js
@@ -8,7 +8,7 @@ Meteor.publish('allSpaces', function() {
 });
 
 Meteor.publish('publicSpaces', function(userId) {
-	return Spaces.find({permissions:{public:true}});
+	return Spaces.find({"permissions.public":true});
 });
 
 Meteor.publish('ownSpaces', function(userId) {

diff --git a/src/settings.json b/src/settings.json
@@ -8,7 +8,7 @@
 	"mailPassword": "",
 	"mailServer": "",
 	"public" : {
-		"isBox": "false",
+		"isBox": "true",
 		 "prefix": "XX",
 		 "ga": {
 			"id": ""