diff --git a/group/views.py b/group/views.py
index c1cb4165b1..c4f85c0c21 100644
--- a/group/views.py
+++ b/group/views.py
@@ -631,7 +631,7 @@ def group_unshare_repo(request, repo_id, group_id, from_email):
         return render_error(request, u'取消共享失败:小组不存在')
     
     # Check whether user belongs to the group.
-    joined = is_group_user(group_id_int, request.user.username)
+    joined = is_group_user(group_id, request.user.username)
 
     if not joined:
         return render_error(request, u'取消共享失败:未加入该小组')
diff --git a/organizations/templates/organizations/org_groups.html b/organizations/templates/organizations/org_groups.html
index 555a36e1c3..4600573c99 100644
--- a/organizations/templates/organizations/org_groups.html
+++ b/organizations/templates/organizations/org_groups.html
@@ -13,30 +13,7 @@
 {% block right_panel %}
 
 <h3>{{ org.org_name }} 的小组</h3>
-{% if groups %}
-<ul class="group-list w100 ovhd">
-    {% for group in groups %}
-    <li class="group fleft">
-    <div class="pic fleft">
-        <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>
-    </div>
-    <div class="txt fright">
-        <h4><a href="{{ SITE_ROOT }}group/{{ group.props.id }}/">{{ group.props.group_name }}</a></h4>
-        <p><span class="item-name">创建者：</span>{{ group.props.creator_name }}</p>
-        <p><span class="item-name">创建时间：</span>{{ group.props.timestamp|tsstr_sec }}</p>
-    </div>
-    </li>
-    {% endfor %}
-</ul>
-{% else %}
-<p>暂无</p>
-{% endif %}
-
-<!-- 添加小组 -->
-{% include "snippets/group_add_form.html" %}
-
+{% include "group/groups_right_panel.html" %}
 {% endblock %}
 
 {% block extra_script %}