From 80f36c899ecd5973b01a97440e44056e7a843912 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 11 May 2015 20:19:27 +0000 Subject: [PATCH] Removed inappropriate group actions and information from external group info pages. Fixes issue #1651. - Legacy-Id: 9615 --- ietf/group/info.py | 2 +- ietf/templates/group/group_about.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ietf/group/info.py b/ietf/group/info.py index 815418c33..976929d9c 100644 --- a/ietf/group/info.py +++ b/ietf/group/info.py @@ -319,7 +319,7 @@ def construct_group_menu_context(request, group, selected, group_type, others): if group.features.customize_workflow and (is_chair or can_manage): actions.append((u"Customize workflow", urlreverse("ietf.group.edit.customize_workflow", kwargs=kwargs))) - if group.state_id in ("active", "dormant") and can_manage: + if group.state_id in ("active", "dormant") and not group.type_id in ["sdo", "rfcedtyp", "isoc", ] and can_manage: actions.append((u"Request closing group", urlreverse("ietf.group.edit.conclude", kwargs=kwargs))) d = { diff --git a/ietf/templates/group/group_about.html b/ietf/templates/group/group_about.html index 8cb428538..6cd9f3210 100644 --- a/ietf/templates/group/group_about.html +++ b/ietf/templates/group/group_about.html @@ -102,7 +102,7 @@ {% endif %} - {% if group.state_id != "conclude" %} + {% if group.state_id != "conclude" and group.type_id != "sdo" and group.type_id != "rfcedtyp" and group.type_id != "isoc" %} Jabber chat