From 9d74151d87bda73281d67156dced5974c7e470c7 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Mon, 1 Apr 2013 13:50:17 +0800
Subject: [PATCH] [group members] can be visited only when view_perm is not
 'pub'

---
 group/templates/group/group_discuss.html    | 2 ++
 group/templates/group/group_members.html    | 4 ++--
 group/templates/group/group_wiki.html       | 2 ++
 group/templates/group/group_wiki_pages.html | 2 ++
 group/views.py                              | 3 +++
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/group/templates/group/group_discuss.html b/group/templates/group/group_discuss.html
index d3d55ca64b..be7af8ed09 100644
--- a/group/templates/group/group_discuss.html
+++ b/group/templates/group/group_discuss.html
@@ -15,7 +15,9 @@
         <li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li>
         <li class="tabnav-tab tabnav-tab-cur">{% trans "Discussion" %}</li>
         <li class="tabnav-tab"><a href="{% url 'group_wiki' group.id %}">{% trans "Wiki" %}</a></li>
+        {% if group.view_perm != 'pub' %}
         <li class="tabnav-tab"><a href="{% url 'group_members' group.id %}">{% trans "Members" %}</a></li>
+        {% endif %}
         {% if is_staff %}
         <li class="tabnav-tab"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li>
         {% endif %}
diff --git a/group/templates/group/group_members.html b/group/templates/group/group_members.html
index 9b4d295746..bf368dabbd 100644
--- a/group/templates/group/group_members.html
+++ b/group/templates/group/group_members.html
@@ -32,9 +32,9 @@
 <ul class="user-list">
     {% for member in members %}
     <li class="user ovhd">
-    <a href="{{ SITE_ROOT }}profile/{{ member.user_name }}/" class="pic fleft">{% avatar member.user_name 48 %}</a>
+    <a href="{{ SITE_ROOT }}profile/{{ member.user_name|email2id }}/" class="pic fleft">{% avatar member.user_name 48 %}</a>
     <div class="txt fright">
-        <a class="name" href="{{ SITE_ROOT }}profile/{{ member.user_name }}/">{{ member.user_name|email2nickname }}</a>
+        <a class="name" href="{{ SITE_ROOT }}profile/{{ member.user_name|email2id }}/">{{ member.user_name|email2nickname }}</a>
         <p>{{ member.user_name }}</p>
         {% if member.can_be_contact %}
         <button class="add-as-contact" data-email="{{ member.user_name }}">{% trans "Add as contact" %}</button>
diff --git a/group/templates/group/group_wiki.html b/group/templates/group/group_wiki.html
index 0ef9fdf94b..d3aa8211ca 100644
--- a/group/templates/group/group_wiki.html
+++ b/group/templates/group/group_wiki.html
@@ -16,7 +16,9 @@
         <li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li>
         <li class="tabnav-tab"><a href="{% url 'group_discuss' group.id %}">{% trans "Discussion" %}</a></li>
         <li class="tabnav-tab tabnav-tab-cur">{% trans "Wiki" %}</li>
+        {% if group.view_perm != 'pub' %}
         <li class="tabnav-tab"><a href="{% url 'group_members' group.id %}">{% trans "Members" %}</a></li>
+        {% endif %}
         {% if is_staff %}
         <li class="tabnav-tab"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li>
         {% endif %}
diff --git a/group/templates/group/group_wiki_pages.html b/group/templates/group/group_wiki_pages.html
index b87f7f90b3..f462a8594d 100644
--- a/group/templates/group/group_wiki_pages.html
+++ b/group/templates/group/group_wiki_pages.html
@@ -15,7 +15,9 @@
         <li class="tabnav-tab"><a href="{% url 'group_info' group.id %}">{% trans "Libraries" %}</a></li>
         <li class="tabnav-tab"><a href="{% url 'group_discuss' group.id %}">{% trans "Discussion" %}</a></li>
         <li class="tabnav-tab tabnav-tab-cur">{% trans "Wiki" %}</li>
+        {% if group.view_perm != 'pub' %}
         <li class="tabnav-tab"><a href="{% url 'group_members' group.id %}">{% trans "Members" %}</a></li>
+        {% endif %}
         {% if is_staff %}
         <li class="tabnav-tab"><a href="{% url 'group_manage' group.id %}">{% trans "Admin" %}</a></li>
         {% endif %}
diff --git a/group/views.py b/group/views.py
index c6485af836..d1507906dd 100644
--- a/group/views.py
+++ b/group/views.py
@@ -471,6 +471,9 @@ def group_info(request, group):
 @group_check
 def group_members(request, group):
 
+    if group.view_perm == 'pub':
+        raise Http404
+
     # Get all group members.
     members = get_group_members(group.id)