From 82356ef4d97556d1dd6faa6d268014ec29a1a014 Mon Sep 17 00:00:00 2001
From: zhengxie <xiez1989@gmail.com>
Date: Mon, 18 Mar 2013 17:19:44 +0800
Subject: [PATCH] * set cache entries to 1000000 * set grp avatar auto generate
 sizes * replace group_members to group_manage * show grp admin in discuss
 page

---
 group/templates/group/group_discuss.html |  4 ++--
 group/templates/group/group_manage.html  |  2 +-
 group/views.py                           | 17 +++--------------
 settings.py                              |  9 +++++++--
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/group/templates/group/group_discuss.html b/group/templates/group/group_discuss.html
index f327224f9f..b596717ec4 100644
--- a/group/templates/group/group_discuss.html
+++ b/group/templates/group/group_discuss.html
@@ -27,9 +27,9 @@
         <h3 class="fleft">{% trans "Members" %}</h3>
     </div>
     <div class="info-item-bottom">
-        {% if common_members %}
+        {% if members %}
           <ul>
-            {% for member in common_members %}
+            {% for member in members %}
               {% if forloop.counter0 < group_members_default_display %}
                 <li class="member">{% avatar member.user_name 16 %}<a class="name" href="{{ SITE_ROOT }}profile/{{ member.user_name }}/">{{ member.user_name|email2nickname }}</a></li>
               {% else %}
diff --git a/group/templates/group/group_manage.html b/group/templates/group/group_manage.html
index 6fb36eb66c..637d3a5aa5 100644
--- a/group/templates/group/group_manage.html
+++ b/group/templates/group/group_manage.html
@@ -108,7 +108,7 @@ contact_email = '{{ contact.contact_email }}';
 contact_list.push({value:contact_email, label:contact_email});
 {% endfor %}
 
-{% url 'group_members' group.id as member_add_url %}
+{% url 'group_manage' group.id as member_add_url %}
 {% with post_url=member_add_url %}
 {% include 'group/grpmember_add_js.html' %}
 {% endwith %}
diff --git a/group/views.py b/group/views.py
index a9b3873b38..b025ab1d1c 100644
--- a/group/views.py
+++ b/group/views.py
@@ -607,14 +607,14 @@ def group_remove_admin(request, group_id):
         messages.success(request, _(u'Operation succeeded.'))
     except SearpcError, e:
         messages.error(request, _(e.msg))
-    return HttpResponseRedirect(reverse('group_members', args=[group_id]))
+    return HttpResponseRedirect(reverse('group_manage', args=[group_id]))
     
 @login_required
 def group_member_operations(request, group_id, user_name):
     if request.GET.get('op','') == 'delete':
         return group_remove_member(request, group_id, user_name)
     else:
-        return HttpResponseRedirect(reverse('group_members', args=[group_id]))
+        return HttpResponseRedirect(reverse('group_manage', args=[group_id]))
 
 @login_required
 def group_remove_member(request, group_id, user_name):
@@ -635,7 +635,7 @@ def group_remove_member(request, group_id, user_name):
     except SearpcError, e:
         messages.error(request, _(u'Failed：%s') % _(e.msg))
 
-    return HttpResponseRedirect(reverse('group_members', args=[group_id]))
+    return HttpResponseRedirect(reverse('group_manage', args=[group_id]))
 
 def group_share_repo(request, repo_id, group_id, from_email, permission):
     """
@@ -969,15 +969,6 @@ def group_discuss(request, group_id):
     members = get_group_members(group_id_int)
     is_staff = True if check_group_staff(group.id, request.user) else False
         
-    managers = []
-    common_members = []
-    for member in members:
-        if member.is_staff == 1:
-            managers.append(member)
-        else:
-            common_members.append(member)
-
-
     """group messages"""
     # Make sure page request is an int. If not, deliver first page.
     try:
@@ -1044,8 +1035,6 @@ def group_discuss(request, group_id):
     pages_show = range(first_page, last_page + 1)
 
     return render_to_response("group/group_discuss.html", {
-            "managers": managers,
-            "common_members": common_members,
             "members": members,
             "group_id": group_id,
             "group" : group,
diff --git a/settings.py b/settings.py
index 90de7b2d03..ff8dac3ecd 100644
--- a/settings.py
+++ b/settings.py
@@ -152,20 +152,25 @@ FILE_ENCODING_TRY_LIST = ['utf-8', 'gbk']
 
 # Avatar
 AVATAR_STORAGE_DIR = 'avatars'
-GROUP_AVATAR_STORAGE_DIR = 'avatars/groups'
 AVATAR_GRAVATAR_BACKUP = False
 AVATAR_DEFAULT_URL = '/avatars/default.jpg'
 AVATAR_DEFAULT_NON_REGISTERED_URL = '/avatars/default-non-register.jpg'
-GROUP_AVATAR_DEFAULT_URL = 'avatars/groups/default.png'
 AVATAR_MAX_AVATARS_PER_USER = 1
 AVATAR_CACHE_TIMEOUT = 24 * 60 * 60
 AVATAR_ALLOWED_FILE_EXTS = ('.jpg', '.png', '.jpeg', '.gif')
 AUTO_GENERATE_AVATAR_SIZES = (16, 20, 28, 40, 48, 60, 80)
+# Group avatar
+GROUP_AVATAR_STORAGE_DIR = 'avatars/groups'
+GROUP_AVATAR_DEFAULT_URL = 'avatars/groups/default.png'
+AUTO_GENERATE_GROUP_AVATAR_SIZES = (20, 24, 48)
 
 CACHES = {
     'default': {
         'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
         'LOCATION': '/tmp/seahub_cache',
+        'OPTIONS': {
+            'MAX_ENTRIES': 1000000
+        }
     }
 }