File tree Expand file tree Collapse file tree 3 files changed +16
-9
lines changed
Expand file tree Collapse file tree 3 files changed +16
-9
lines changed Original file line number Diff line number Diff line change @@ -147,8 +147,9 @@ class GroupAssignments extends Component {
147147 const canLeaveGroup =
148148 ! isGroupAdmin &&
149149 ! isGroupSupervisor &&
150- ( data . public || ( isGroupStudent && ! data . privateData . detaining ) ) &&
151- ! data . organizational ;
150+ ! data . organizational &&
151+ ! data . archived &&
152+ ( data . public || ( isGroupStudent && ! data . privateData . detaining ) ) ;
152153
153154 const studentEmails =
154155 ! data . organizational &&
@@ -201,7 +202,7 @@ class GroupAssignments extends Component {
201202 < GroupArchivedWarning
202203 { ...data }
203204 groupsDataAccessor = { groupsAccessor }
204- linkFactory = { GROUP_ASSIGNMENTS_URI_FACTORY }
205+ linkFactory = { isGroupStudent ? null : GROUP_ASSIGNMENTS_URI_FACTORY }
205206 />
206207
207208 { ! data . organizational && hasPermissions ( data , 'viewAssignments' ) && (
Original file line number Diff line number Diff line change @@ -136,16 +136,21 @@ class GroupInfo extends Component {
136136
137137 { ! isAdmin &&
138138 ! isSupervisor &&
139- ( data . public || ( isStudent && ! data . privateData . detaining ) ) &&
140- ! data . organizational && (
139+ ! data . organizational &&
140+ ! data . archived &&
141+ ( data . public || ( isStudent && ! data . privateData . detaining ) ) && (
141142 < div className = "my-3" >
142143 < LeaveJoinGroupButtonContainer userId = { userId } groupId = { data . id } size = { null } redirectAfterLeave />
143144 </ div >
144145 ) }
145146
146147 { data . privateData && < GroupExamPending { ...data } currentUser = { currentUser } /> }
147148
148- < GroupArchivedWarning { ...data } groupsDataAccessor = { groupsAccessor } linkFactory = { GROUP_INFO_URI_FACTORY } />
149+ < GroupArchivedWarning
150+ { ...data }
151+ groupsDataAccessor = { groupsAccessor }
152+ linkFactory = { isStudent ? null : GROUP_INFO_URI_FACTORY }
153+ />
149154
150155 { ! hasPermissions ( data , 'viewPublicDetail' ) && (
151156 < Row >
Original file line number Diff line number Diff line change @@ -138,8 +138,9 @@ class GroupStudents extends Component {
138138 const canLeaveGroup =
139139 ! isGroupAdmin &&
140140 ! isGroupSupervisor &&
141- ( data . public || ( isGroupStudent && ! data . privateData . detaining ) ) &&
142- ! data . organizational ;
141+ ! data . organizational &&
142+ ! data . archived &&
143+ ( data . public || ( isGroupStudent && ! data . privateData . detaining ) ) ;
143144
144145 const studentEmails =
145146 ! data . organizational &&
@@ -192,7 +193,7 @@ class GroupStudents extends Component {
192193 < GroupArchivedWarning
193194 { ...data }
194195 groupsDataAccessor = { groupsAccessor }
195- linkFactory = { GROUP_STUDENTS_URI_FACTORY }
196+ linkFactory = { isGroupStudent ? null : GROUP_STUDENTS_URI_FACTORY }
196197 />
197198
198199 { isStudentRole ( effectiveRole ) &&
You can’t perform that action at this time.
0 commit comments