[myhome]combine groups_manage and groups_join

templates/myhome.html

@@ -38,10 +38,10 @@
 <h3>已用空间</h3>
 <p>{{ quota_usage|filesizeformat }} {% if cloud_mode %}/ 2 GB {% endif %}</p>
 
-<h3>我管理的小组</h3>
-{% if groups_manage %}
+<h3>我的小组</h3>
+{% if groups %}
 <ul>
-    {% for group in groups_manage %}
+    {% for group in groups %}
     <li class="mygroup">
     <a href="{{ SITE_ROOT }}group/{{ group.props.id }}/" class="no-deco">
         <img src="{% grp_avatar_url group.props.id 48 %}" alt="{{ group.props.group_name }}的图标" title="{{ group.props.group_name }}" class="avatar" />
@@ -54,22 +54,6 @@
 <p>暂无</p>
 {% endif %}
 
-<h3>我参加的小组</h3>
-{% if groups_join %}
-<ul>
-	{% for group in groups_join %}
-    <li class="mygroup">
-    <a href="{{ SITE_ROOT }}group/{{ group.props.id }}/" class="no-deco">
-        <img src="{% grp_avatar_url group.props.id 48 %}" alt="{{ group.props.group_name }}的图标" title="{{ group.props.group_name }}" class="avatar" />
-    </a><br />
-	<a href="{{ SITE_ROOT }}group/{{ group.props.id }}/">{{ group.props.group_name }}</a>
-	</li>
-	{% endfor %}
-</ul>
-{% else %}
-<p>暂无</p>
-{% endif %}
-
 {% endblock %}
 
 

views.py

@@ -678,14 +678,6 @@ def myhome(request):
     # my groups
     groups = get_personal_groups(email)
 
-    groups_manage = []
-    groups_join = []
-    for group in groups:
-        if group.props.creator_name == request.user.username:
-            groups_manage.append(group)
-        else:
-            groups_join.append(group)
-    
     # get nickname
     if not Profile.objects.filter(user=request.user.username):
         nickname = ''
@@ -709,8 +701,6 @@ def myhome(request):
             "grpmsg_list": grpmsg_list,
             "grpmsg_reply_list": grpmsg_reply_list,
             "orgmsg_list": orgmsg_list,
-            "groups_manage": groups_manage,
-            "groups_join": groups_join,
             "url": settings.SITE_ROOT + 'repo/create/',
             }, context_instance=RequestContext(request))