[dir shared items] modified 'perm edit', bugfix & add 'error handle' for 'list/add/delete', clean up code

seahub/share/urls.py

@@ -37,6 +37,5 @@ urlpatterns = patterns('',
     url(r'^ajax/get-download-link/$', ajax_get_download_link, name='ajax_get_download_link'),
     url(r'^ajax/get-upload-link/$', ajax_get_upload_link, name='ajax_get_upload_link'),
     url(r'^ajax/private-share-file/$', ajax_private_share_file, name='ajax_private_share_file'),
-
     url(r'^ajax/private-share-dir/$', ajax_private_share_dir, name='ajax_private_share_dir'),
 )

seahub/urls.py

@@ -177,11 +177,8 @@ urlpatterns = patterns('',
 
     url(r'^_templates/(?P<template>.*)$', underscore_template, name="underscore_template"),
 
-
     ## ajax lib
     url(r'^ajax/lib/(?P<repo_id>[-0-9a-f]{36})/dir/$', list_lib_dir, name="list_lib_dir"),
-    url(r'^ajax/lib/(?P<repo_id>[-0-9a-f]{36})/dir-user-share-items/$', get_dir_user_share_items, name='get_dir_user_share_items'),
-    url(r'^ajax/lib/(?P<repo_id>[-0-9a-f]{36})/dir-group-share-items/$', get_dir_group_share_items, name='get_dir_group_share_items'),
 
     url(r'^ajax/unset-inner-pub-repo/(?P<repo_id>[-0-9a-f]{36})/$', ajax_unset_inner_pub_repo, name='ajax_unset_inner_pub_repo'),
 

seahub/views/ajax.py

@@ -16,8 +16,7 @@ from django.contrib import messages
 from django.template.defaultfilters import filesizeformat
 
 import seaserv
-from seaserv.api import seafile_api
-from seaserv import seafserv_rpc, is_passwd_set, \
+from seaserv import seafile_api, seafserv_rpc, is_passwd_set, \
     get_related_users_by_repo, get_related_users_by_org_repo, \
     CALC_SHARE_USAGE, seafserv_threaded_rpc, ccnet_threaded_rpc, \
     get_user_quota_usage, get_user_share_usage, edit_repo, \
@@ -2709,86 +2708,3 @@ def ajax_unset_inner_pub_repo(request, repo_id):
     except SearpcError:
         return HttpResponse(json.dumps({"error": _('Internal server error')}),
                 status=500, content_type=content_type)
-
-@login_required_ajax
-def get_dir_user_share_items(request, repo_id):
-    """
-    Get share items for a dir: share to users
-    """
-    content_type = 'application/json; charset=utf-8'
-    result = {}
-
-    repo = get_repo(repo_id)
-    if not repo:
-        result["error"] = _('Library does not exist.')
-        return HttpResponse(json.dumps(result),
-                            status=400, content_type=content_type)
-
-    path = request.GET.get('p', None)
-    if not path:
-        result["error"] = _(u'Argument missing')
-        return HttpResponse(json.dumps(result),
-                status=400, content_type=content_type)
-
-    user = request.user.username
-    try:
-        if path == '/':
-            share_items = seafile_api.list_repo_shared_to(user, repo_id)
-        else:
-            share_items = seafile_api.get_shared_users_for_subdir(repo_id, path, user)
-
-        share_items_ = []
-        for item in share_items:
-            share_item = {
-                "user": item.user,
-                "user_name": email2nickname(item.user),
-                "perm": item.perm,
-            }
-            share_items_.append(share_item)
-        return HttpResponse(json.dumps(share_items_), content_type=content_type)
-    except SearpcError, e:
-        logger.error(e)
-        result["error"] = _('Internal server error')
-        return HttpResponse(json.dumps(result), status=500, content_type=content_type)
-
-@login_required_ajax
-def get_dir_group_share_items(request, repo_id):
-    """
-    Get share items for a dir: share to groups
-
-    """
-    content_type = 'application/json; charset=utf-8'
-    result = {}
-
-    repo = get_repo(repo_id)
-    if not repo:
-        result["error"] = _('Library does not exist.')
-        return HttpResponse(json.dumps(result),
-                            status=400, content_type=content_type)
-
-    path = request.GET.get('p', None)
-    if not path:
-        result["error"] = _(u'Argument missing')
-        return HttpResponse(json.dumps(result),
-                status=400, content_type=content_type)
-
-    user = request.user.username
-    try:
-        if path == '/':
-            share_items = seafile_api.list_repo_shared_group(user, repo_id)
-        else:
-            share_items = seafile_api.get_shared_groups_for_subdir(repo_id, path, user)
-
-        share_items_ = []
-        for item in share_items:
-            share_item = {
-                "group_id": item.group_id,
-                "group_name": get_group(item.group_id).group_name,
-                "perm": item.perm,
-            }
-            share_items_.append(share_item)
-        return HttpResponse(json.dumps(share_items_), content_type=content_type)
-    except SearpcError, e:
-        logger.error(e)
-        result["error"] = _('Internal server error')
-        return HttpResponse(json.dumps(result), status=500, content_type=content_type)

static/scripts/app/views/folder-share-item.js

@@ -49,39 +49,39 @@ define([
         editPerm: function (e) {
             var _this = this;
             var item_data = this.item_data;
-            var for_user = item_data.for_user;
-            var share_type = for_user ? 'personal' : 'group';
+            var url = Common.getUrl({
+                    name: 'dir_shared_items',
+                    repo_id: this.repo_id
+                }) + '?p=' + encodeURIComponent(this.path);
+            if (item_data.for_user) {
+                url += '&share_type=user&username=' + encodeURIComponent(item_data.user);
+            } else {
+                url += '&share_type=group&group_id=' + encodeURIComponent(item_data.group_id);
+            }
             var perm = $(e.currentTarget).val();
-            var post_data = {
-                repo_id: this.repo_id,
-                email_or_group: for_user ? item_data.user : item_data.group_id,
-                permission: perm 
-            };
-
             $.ajax({
-                url: Common.getUrl({
-                    name: 'share_permission_admin' 
-                }) + '?share_type=' + share_type,
-                type: 'POST',
+                url: url,
                 dataType: 'json',
-                cache: false,
+                method: 'POST',
                 beforeSend: Common.prepareCSRFToken,
-                data: post_data,
-                success: function() {
+                data: {
+                    'permission': perm
+                },
+                success: function () {
                     item_data.perm = perm;
                     _this.render();
                 },
                 error: function(xhr) {
-                    var err;
+                    var err_msg;
                     if (xhr.responseText) {
-                        err = $.parseJSON(xhr.responseText).error;
+                        err_msg = gettext("Edit failed");
                     } else {
-                        err = gettext("Failed. Please check the network.");
+                        err_msg = gettext("Failed. Please check the network.");
                     }
-                    if (share_type == 'personal') {
-                        $('#dir-user-share .error').html(err).removeClass('hide');
+                    if (item_data.for_user) {
+                        $('#dir-user-share .error').html(err_msg).removeClass('hide');
                     } else {
-                        $('#dir-group-group .error').html(err).removeClass('hide');
+                        $('#dir-group-group .error').html(err_msg).removeClass('hide');
                     }
                 }
             });
@@ -97,7 +97,7 @@ define([
             if (item_data.for_user) {
                 url += '&share_type=user&username=' + encodeURIComponent(item_data.user);
             } else {
-                url += '&share_type=group&username=' + encodeURIComponent(item_data.group_id);
+                url += '&share_type=group&group_id=' + encodeURIComponent(item_data.group_id);
             }
             $.ajax({
                 url: url,
@@ -107,8 +107,18 @@ define([
                 success: function () {
                     _this.remove();
                 },
-                error: {
-                    // TODO
+                error: function (xhr) {
+                    var err_msg;
+                    if (xhr.responseText) {
+                        err_msg = gettext("Delete failed");
+                    } else {
+                        err_msg = gettext("Failed. Please check the network.");
+                    }
+                    if (item_data.for_user) {
+                        $('#dir-user-share .error').html(err_msg).removeClass('hide');
+                    } else {
+                        $('#dir-group-group .error').html(err_msg).removeClass('hide');
+                    }
                 }
             });
         }

static/scripts/app/views/share.js

@@ -551,6 +551,7 @@ define([
         },
 
         dirUserShare: function () {
+            var panel = $('#dir-user-share');
             var form = this.$('#add-dir-user-share-item');
 
             var emails_input = $('[name="emails"]', form),
@@ -572,14 +573,13 @@ define([
                 dataType: 'json',
                 method: 'PUT',
                 beforeSend: Common.prepareCSRFToken,
-                trandition: true,
+                traditional: true,
                 data: {
                     'share_type': 'user',
                     'username': emails.split(','),
                     'permission': perm
                 },
                 success: function(data) {
-                    // todo: those failed to share to
                     $(data.success).each(function(index, item) {
                         var new_item = new FolderShareItemView({
                             'repo_id': repo_id,
@@ -594,14 +594,26 @@ define([
                         $add_item.after(new_item.el);
                     });
                     emails_input.select2("val", "");
+                    if (data.failed) {
+                        var err_msg = gettext("Failed to share to {placeholder}")
+                            .replace('{placeholder}', Common.HTMLescape(data.failed.join(', ')));
+                        $('.error', panel).html(err_msg).removeClass('hide');
+                    }
                 },
                 error: function(xhr) {
-                    // todo
+                    var err_msg;
+                    if (xhr.responseText) {
+                        err_msg = gettext("Share failed");
+                    } else {
+                        err_msg = gettext("Failed. Please check the network.")
+                    }
+                    $('.error', panel).html(err_msg).removeClass('hide');
                 }
             });
         },
 
         dirGroupShare: function () {
+            var panel = $('#dir-group-share');
             var form = this.$('#add-dir-group-share-item');
 
             var groups_input = $('[name="groups"]', form),
@@ -624,14 +636,13 @@ define([
                 dataType: 'json',
                 method: 'PUT',
                 beforeSend: Common.prepareCSRFToken,
-                trandition: true,
+                traditional: true,
                 data: {
                     'share_type': 'group',
                     'group_id': groups,
                     'permission': perm
                 },
                 success: function(data) {
-                    // todo: those failed to share to 
                     $(data.success).each(function(index, item) {
                         var new_item = new FolderShareItemView({
                             'repo_id': repo_id,
@@ -648,7 +659,13 @@ define([
                     groups_input.select2("val", "");
                 },
                 error: function(xhr) {
-                    // todo 
+                    var err_msg;
+                    if (xhr.responseText) {
+                        err_msg = gettext("Share failed");
+                    } else {
+                        err_msg = gettext("Failed. Please check the network.")
+                    }
+                    $('.error', panel).html(err_msg).removeClass('hide');
                 }
             });
         }

static/scripts/common.js

@@ -95,7 +95,6 @@ define([
               case 'send_shared_upload_link': return siteRoot + 'share/upload_link/send/';
               case 'delete_shared_upload_link': return siteRoot + 'share/ajax/upload_link/remove/';
               case 'get_share_upload_link': return siteRoot + 'share/ajax/get-upload-link/';
-              //case 'private_share_dir': return siteRoot + 'share/ajax/private-share-dir/';
               case 'private_share_file': return siteRoot + 'share/ajax/private-share-file/';
               case 'get_popup_notices': return siteRoot + 'ajax/get_popup_notices/';
               case 'set_notices_seen': return siteRoot + 'ajax/set_notices_seen/';
@@ -113,9 +112,6 @@ define([
               case 'starred_files': return siteRoot + 'api2/starredfiles/';
               case 'shared_repos': return siteRoot + 'api2/shared-repos/' + options.repo_id + '/';
               case 'search_user': return siteRoot + 'api2/search-user/';
-              case 'share_permission_admin': return siteRoot + 'share/permission_admin/';
-              //case 'get_dir_user_share_items': return siteRoot + 'ajax/lib/' + options.repo_id + '/dir-user-share-items/';
-              //case 'get_dir_group_share_items': return siteRoot + 'ajax/lib/' + options.repo_id + '/dir-group-share-items/';
               case 'dir_shared_items': return siteRoot + 'api2/repos/' + options.repo_id + '/dir/shared_items/';
             }
         },