From c3627012a72c4f7e2ed573f83e0655b13b37b090 Mon Sep 17 00:00:00 2001
From: Martin Krulis <krulis@ksi.mff.cuni.cz>
Date: Fri, 16 Feb 2018 12:28:27 +0100
Subject: [PATCH 1/2] Fixing bug - public group indicator is shown correctly in
 Hierarchy views.

---
 src/components/Groups/GroupDetail/GroupDetail.js | 1 +
 src/components/Groups/GroupTree/GroupTree.js     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/Groups/GroupDetail/GroupDetail.js b/src/components/Groups/GroupDetail/GroupDetail.js
index 52ba1f02f..cd6b1f94b 100644
--- a/src/components/Groups/GroupDetail/GroupDetail.js
+++ b/src/components/Groups/GroupDetail/GroupDetail.js
@@ -119,6 +119,7 @@ const GroupDetail = ({
                   id={id}
                   deletable={false}
                   isAdmin={isAdmin}
+                  isPublic={isPublic}
                   isOpen
                   groups={groups}
                   level={1}
diff --git a/src/components/Groups/GroupTree/GroupTree.js b/src/components/Groups/GroupTree/GroupTree.js
index a9f48bafa..1a843cc6d 100644
--- a/src/components/Groups/GroupTree/GroupTree.js
+++ b/src/components/Groups/GroupTree/GroupTree.js
@@ -77,7 +77,7 @@ class GroupTree extends Component {
       id,
       level = 0,
       isOpen = false,
-      isPublic = true,
+      isPublic = false,
       groups,
       currentGroupId = null,
       visibleGroupsMap = null,
@@ -86,7 +86,7 @@ class GroupTree extends Component {
 
     const group = groups.get(id);
     if (!group || !isReady(group)) {
-      return isPublic ? this.renderLoading(level) : null;
+      return this.renderLoading(level);
     }
 
     const {

From 173943aa16826624c11375dac2ad50e4e640af52 Mon Sep 17 00:00:00 2001
From: Martin Krulis <krulis@ksi.mff.cuni.cz>
Date: Fri, 16 Feb 2018 12:43:58 +0100
Subject: [PATCH 2/2] Fixing initial flag states for new group in forms.

---
 src/components/Groups/AdminsView/AdminsView.js | 4 +++-
 src/pages/Instance/Instance.js                 | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/Groups/AdminsView/AdminsView.js b/src/components/Groups/AdminsView/AdminsView.js
index 7a04ea093..e7bd76d7e 100644
--- a/src/components/Groups/AdminsView/AdminsView.js
+++ b/src/components/Groups/AdminsView/AdminsView.js
@@ -10,6 +10,8 @@ import AddSupervisor from '../AddSupervisor';
 import EditGroupForm from '../../forms/EditGroupForm';
 import { getLocalizedName } from '../../../helpers/getLocalizedData';
 
+const EMPTY_OBJECT = {};
+
 const AdminsView = ({ group, addSubgroup, formValues, intl: { locale } }) =>
   <div>
     <Row>
@@ -42,7 +44,7 @@ const AdminsView = ({ group, addSubgroup, formValues, intl: { locale } }) =>
       <Col md={6}>
         <EditGroupForm
           onSubmit={addSubgroup}
-          initialValues={{ publicStats: true }}
+          initialValues={EMPTY_OBJECT}
           createNew
           collapsable
           isOpen={false}
diff --git a/src/pages/Instance/Instance.js b/src/pages/Instance/Instance.js
index 43e4bcc57..dc68d18e2 100644
--- a/src/pages/Instance/Instance.js
+++ b/src/pages/Instance/Instance.js
@@ -27,6 +27,8 @@ import { isLoggedAsSuperAdmin } from '../../redux/selectors/users';
 
 import withLinks from '../../hoc/withLinks';
 
+const EMPTY_OBJECT = {};
+
 class Instance extends Component {
   static loadAsync = ({ instanceId }, dispatch) =>
     Promise.all([
@@ -112,9 +114,9 @@ class Instance extends Component {
                     instanceId={instanceId}
                     createNew
                     collapsable={true}
-                    isOpen={false}
+                    isOpen={true}
                     formValues={formValues}
-                    initialValues={{ publicStats: true }}
+                    initialValues={EMPTY_OBJECT}
                   />
                 </Col>
                 <Col sm={6}>