Merge pull request RocketChat#275 from assistify/feature/RocketChat#209…

…-enable-guest-to-create-requests Enable guest user to create requests
redlink-gmbh · Mar 19, 2018 · 22719d4 · 22719d4
2 parents 4bdc997 + 98e9d2c
commit 22719d4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/packages/rocketchat-ui-sidenav/client/toolbar.js b/packages/rocketchat-ui-sidenav/client/toolbar.js
@@ -93,7 +93,7 @@ const getFromServerDebounced = _.debounce(getFromServer, 500);
 
 Template.toolbar.helpers({
 	canCreate() {
-		return RocketChat.authz.hasAtLeastOnePermission(['create-c', 'create-p']);
+		return RocketChat.authz.hasAtLeastOnePermission(RocketChat.roomTypes.roomTypesOrder.map((type) => `create-${ type.identifier }`));
 	},
 	results() {
 		return Template.instance().resultsList.get();
@@ -231,7 +231,7 @@ Template.toolbar.events({
 	},
 
 	'click [role="search"] button, touchend [role="search"] button'(e) {
-		if (RocketChat.authz.hasAtLeastOnePermission(['create-c', 'create-p'])) {
+		if (RocketChat.authz.hasAtLeastOnePermission(RocketChat.roomTypes.roomTypesOrder.map((type) => `create-${ type.identifier }`))) {
 			// TODO: resolve this name menu/sidebar/sidebav/flex...
 			menu.close();
 			FlowRouter.go('create-channel');

diff --git a/packages/rocketchat-ui/client/views/app/createRooms.js b/packages/rocketchat-ui/client/views/app/createRooms.js
@@ -20,12 +20,20 @@ const roomTypesAfterStandard = function() {
 	).filter((roomType) => roomType.creationTemplate && roomType.canBeCreated());
 };
 
-const allTemplatesOrdered = function() {
-	return roomTypesBeforeStandard()
-		.concat([{
+const standardRoomType = function() {
+	if (RocketChat.authz.hasAtLeastOnePermission(['create-c', 'create-p'])) {
+		return [{
 			creationLabel: 'Create_A_New_Channel',
 			creationTemplate: 'createChannel'
-		}])
+		}];
+	} else {
+		return [];
+	}
+};
+
+const allTemplatesOrdered = function() {
+	return roomTypesBeforeStandard()
+		.concat(standardRoomType())
 		.concat(roomTypesAfterStandard())
 		.map((roomtype) => {
 			return {