Merge branch 'pichalite-issue-4258'

public/language/en_GB/groups.json

@@ -47,6 +47,7 @@
 	"details.hidden": "Hidden",
 	"details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
 	"details.delete_group": "Delete Group",
+	"details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
 
 	"event.updated": "Group details have been updated",
 	"event.deleted": "The group \"%1\" has been deleted",

src/controllers/admin/groups.js

@@ -66,7 +66,7 @@ groupsController.get = function(req, res, callback) {
 			return callback(err);
 		}
 		group.isOwner = true;
-		res.render('admin/manage/group', {group: group});
+		res.render('admin/manage/group', {group: group, allowPrivateGroups: parseInt(meta.config.allowPrivateGroups, 10) === 1});
 	});
 };
 

src/controllers/groups.js

@@ -90,6 +90,7 @@ groupsController.details = function(req, res, callback) {
 			}
 			results.title = '[[pages:group, ' + results.group.displayName + ']]';
 			results.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[pages:groups]]', url: '/groups' }, {text: results.group.displayName}]);
+			results.allowPrivateGroups = parseInt(meta.config.allowPrivateGroups, 10) === 1;
 			plugins.fireHook('filter:group.build', {req: req, res: res, templateData: results}, next);
 		}
 	], function(err, results) {

src/views/admin/manage/group.tpl

@@ -39,10 +39,15 @@
 				<fieldset>
 					<div class="checkbox">
 						<label>
-							<input id="group-private" name="private" type="checkbox"<!-- IF group.private --> checked<!-- ENDIF group.private -->> <strong>Private</strong>
+							<input id="group-private" name="private" type="checkbox"<!-- IF group.private --> checked<!-- ENDIF group.private -->> <strong>[[groups:details.private]]</strong>
 							<p class="help-block">
-								If enabled, joining of groups requires approval from a group owner
+								If enabled, joining of groups requires approval from a group owner.
 							</p>
+							<!-- IF !allowPrivateGroups -->
+							<p class="help-block">
+								Warning: Private groups is disabled at system level, which overrides this option.
+							</p>
+							<!-- ENDIF !allowPrivateGroups -->
 						</label>
 					</div>
 				</fieldset>