Modify group create, and clean code

organizations/views.py

@@ -182,9 +182,11 @@ def org_groups(request, url_prefix):
                     })
         
         try:
-            group_id = ccnet_threaded_rpc.create_group(group_name.encode('utf-8'),
+            e_grpname = group_name.encode('utf-8')
-                                   request.user.username)
+            user = request.user.username
-            ccnet_threaded_rpc.add_org_group(org.org_id, group_id)
+            group_id = ccnet_threaded_rpc.create_org_group(org.org_id,
+                                                           e_grpname,
+                                                           user)
         except SearpcError, e:
             error_msg = e.msg
             return render_error(request, error_msg, extra_ctx={
@@ -192,7 +194,7 @@ def org_groups(request, url_prefix):
                     'base_template': 'org_base.html',
                     })
         
-    groups = get_org_groups(org.org_id, 0, MAX_INT)
+    groups = get_org_groups(org.org_id, -1, -1)
     return render_to_response('organizations/org_groups.html', {
             'org': org,
             'groups': groups,

templates/org_info.html

@@ -1,103 +0,0 @@
-{% extends "myhome_base.html" %}
-{% load seahub_tags avatar_tags %}
-
-{% block nav_org_class %}class="cur"{% endblock %}
-
-{% block main_panel %}
-<h2>{{ org.org_name }}</h2>
-<div class="side fright">
-<h3>企业成员</h3>
-{% if org_users %}
-<ul>
-    {% for member in org_users %}
-	<li class="org-member">{% avatar member.user_name 16 %}<span class="org-member-name"><a href="{{ SITE_ROOT }}profile/{{ member.email }}/">{{ member.email|email2nickname }}</a></span></li>
-    {% endfor %}
-</ul>
-{% else %}
-<p>暂无</p>
-{% endif %}
-
-{% if is_join %}
-<h3>操作</h3>
-<ul class="with-bg">
-{% if is_staff %}
-    <li><a id="group-mgr" href="{{ SITE_ROOT }}group/{{ group.id }}/members/">小组管理</a></li>
-{% else %}
-	<li><a id="quit-group" href="#" data="{{ SITE_ROOT }}group/{{ group.id }}/?op=quit">退出小组</a></li>
-{% endif %}
-</ul>
-{% endif %}
-</div>
-
-<div class="main fleft">
-<h3>企业里公开的同步目录</h3>
-{% if repos %}
-<table>
-    <tr>
-        <th width="20%">名字</th>
-        <th width="48%">描述</th>
-        <th width="22%">共享来源</th>
-        <th width="10%">操作</th>
-    </tr>
-
-    {% for repo in repos %}
-    <tr>
-        <td><a href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/">{{ repo.props.name }}</a></td>
-        <td>{{ repo.props.desc }}</td>
-        <td>{{ repo.owner }}</td>
-        <td>
-            <img src="{{ MEDIA_URL }}img/download-20.png" class="download vh" data="{{ SITE_ROOT }}seafile_access_check/?repo_id={{ repo.props.id }}" alt="下载" title="下载" />
-        {% if is_staff or repo.share_from_me  %}
-            <img src="{{ MEDIA_URL }}img/delete-20.png" class="cancel-share vh" data="{{ SITE_ROOT }}shareadmin/removeshare/?repo_id={{ repo.props.id }}&from={{ repo.owner }}&gid={{ group.id }}" title="取消共享" alt="取消共享" />
-        {% endif %}
-        </td>
-    </tr>
-    {% endfor %}
-</table>
-{% else %}
-<p>暂无</p>
-{% endif %}
-
-<h3>企业里的小组</h3>
-{% if groups %}
-<table>
-  <tr>
-    <th width="30%">名字</th>
-    <th widht="40%">创建者</th>
-    <th width="30%">创建时间</th>
-  </tr>
-  
-  {% for group in groups %}
-  <tr>
-    <td>{{ group.group_name }}</td>
-    <td>{{ group.creator_name }}</td>
-    <td>{{ group.timestamp|tsstr_sec }}</td>
-  </tr>
-  {% endfor %}
-  
-</table>
-{% else %}
-<p>暂无</p>
-{% endif %}
-</div>
-{% endblock %}
-
-{% block extra_script %}
-<script type="text/javascript">
-    addConfirmTo($('#quit-group'), '确定要退出？');
-    addConfirmTo($('.cancel-share'), '确定要取消共享该目录？');
-
-    $("table tr:gt(0)").hover(
-        function() {
-            $(this).find('img').css('cursor', 'pointer').removeClass('vh');
-        },
-        function() {
-            $(this).find('img').addClass('vh');
-        }
-    );
-
-    $('.download').click(function() {
-        window.open($(this).attr('data'));
-    });
-</script>
-{% endblock %}

thirdpart/seaserv/service.py

@@ -153,7 +153,7 @@ def get_org_id_by_group(group_id):
 
 def get_org_groups(org_id, start, limit):
     try:
-        groups = ccnet_threaded_rpc.get_org_groups(org_id, 0, MAX_INT)
+        groups = ccnet_threaded_rpc.get_org_groups(org_id, start, limit)
     except SearpcError:
         groups = []
     return groups

urls.py

@@ -7,7 +7,7 @@ from seahub.views import root, myhome, public_home,  \
     activate_user, user_add, user_remove, sys_group_admin, sys_org_admin, \
     ownerhome, repo_history_revert, repo_file_edit, org_remove, user_reset, \
     user_info, repo_set_access_property, repo_access_file, \
-    repo_remove_share, repo_download, org_info, repo_view_file, pdf_full_view, \
+    repo_remove_share, repo_download, repo_view_file, pdf_full_view, \
     seafile_access_check, repo_history_changes, \
     repo_upload_file, file_upload_progress_page, \
     upload_file_error, update_file_error, \
@@ -83,7 +83,7 @@ urlpatterns = patterns('',
     (r'^file/move/$', file_move),
     (r'^seafile_access_check/$', seafile_access_check),                       
     url(r'^org/remove/(?P<org_id>[\d]+)/$', org_remove, name="org_remove"),
-    (r'^org/$', org_info),
+    # (r'^org/$', org_info),
 
     (r'^useradmin/add/$', user_add),
     (r'^useradmin/remove/(?P<user_id>[^/]+)/$', user_remove),

views.py

@@ -1567,24 +1567,24 @@ def org_remove(request, org_id):
     
     return HttpResponseRedirect(reverse('sys_org_admin'))
 
-@login_required
+# @login_required
-def org_info(request):
+# def org_info(request):
-    if not request.user.org:
+#     if not request.user.org:
-        raise Http404
+#         raise Http404
 
-    org = request.user.org
+#     org = request.user.org
     
-    org_members = ccnet_threaded_rpc.get_org_emailusers(org.url_prefix, 0, MAX_INT)
+#     org_members = ccnet_threaded_rpc.get_org_emailusers(org.url_prefix, 0, MAX_INT)
-    for member in org_members:
+#     for member in org_members:
-        member.short_username = member.email.split('@')[0]
+#         member.short_username = member.email.split('@')[0]
 
-    groups = ccnet_threaded_rpc.get_org_groups(org.org_id, 0, MAX_INT)
+#     groups = get_org_groups(org.org_id, -1, -1)
     
-    return render_to_response('org_info.html', {
+#     return render_to_response('org_info.html', {
-            'org': org,
+#             'org': org,
-            'org_users': org_members,
+#             'org_users': org_members,
-            'groups': groups,
+#             'groups': groups,
-            }, context_instance=RequestContext(request))
+#             }, context_instance=RequestContext(request))
 
 @login_required
 def file_upload_progress_page(request):