Merge branch '5.0'

Conflicts:
	media/css/sf_font2/seafile-font2.eot
	media/css/sf_font2/seafile-font2.ttf
	media/css/sf_font2/seafile-font2.woff
	requirements.txt
	seahub/api2/endpoints/dir_shared_items.py
	seahub/templates/js/templates.html
	seahub/views/ajax.py
	static/scripts/app/views/group-repo.js

static/scripts/app/views/dir.js

@@ -644,21 +644,29 @@ define([
 
                 var title = op == 'mv' ? gettext("Move selected item(s) to:") : gettext("Copy selected item(s) to:");
 
+                var show_cur_repo = true;
+                if (dir.user_perm == 'r') {
+                    show_cur_repo = false;
+                }
+
                 var form = $(this.mvcpTemplate({
                     form_title: title,
                     op_type: op,
                     obj_type: '',
                     obj_name: '',
+                    show_cur_repo: show_cur_repo,
                     show_other_repos: !dir.encrypted
                 }));
                 form.modal({appendTo:'#main', autoResize:true, focus:false});
                 $('#simplemodal-container').css({'width':'auto', 'height':'auto'});
 
-                FileTree.renderTreeForPath({
-                    repo_name: dir.repo_name,
-                    repo_id: dir.repo_id,
-                    path: dir.path
-                });
+                if (show_cur_repo) {
+                    FileTree.renderTreeForPath({
+                        repo_name: dir.repo_name,
+                        repo_id: dir.repo_id,
+                        path: dir.path
+                    });
+                }
                 if (!dir.encrypted) {
                     FileTree.prepareOtherReposTree({cur_repo_id: dir.repo_id});
                 }

static/scripts/app/views/dirent.js

@@ -32,6 +32,7 @@ define([
             var dir = this.dir;
             var dirent_path = Common.pathJoin([dir.path, this.model.get('obj_name')]);
             var is_pro = app.pageOptions.is_pro;
+            var file_audit_enabled = app.pageOptions.file_audit_enabled;
 
             this.$el.html(this.template({
                 dirent: this.model.attributes,
@@ -42,6 +43,7 @@ define([
                 is_repo_owner: dir.is_repo_owner,
                 can_generate_shared_link: app.pageOptions.can_generate_shared_link,
                 is_pro: is_pro,
+                file_audit_enabled: file_audit_enabled,
                 repo_encrypted: dir.encrypted
             }));
             this.$('.file-locked-icon').attr('title', gettext("locked by {placeholder}").replace('{placeholder}', this.model.get('lock_owner_name')));
@@ -308,21 +310,28 @@ define([
             var title = op_type == 'mv' ? gettext("Move {placeholder} to:") : gettext("Copy {placeholder} to:");
             title = title.replace('{placeholder}', '<span class="op-target ellipsis ellipsis-op-target" title="' + Common.HTMLescape(obj_name) + '">' + Common.HTMLescape(obj_name) + '</span>');
 
+            var show_cur_repo = true;
+            if (this.model.get('perm') == 'r') {
+                show_cur_repo = false;
+            }
             var form = $(this.mvcpTemplate({
                 form_title: title,
                 op_type: op_type,
                 obj_type: obj_type,
                 obj_name: obj_name,
-                show_other_repos: !dir.encrypted,
+                show_cur_repo: show_cur_repo,
+                show_other_repos: !dir.encrypted
             }));
             form.modal({appendTo:'#main', autoResize:true, focus:false});
             $('#simplemodal-container').css({'width':'auto', 'height':'auto'});
 
-            FileTree.renderTreeForPath({
-                repo_name: dir.repo_name,
-                repo_id: dir.repo_id,
-                path: dir.path
-            });
+            if (show_cur_repo) {
+                FileTree.renderTreeForPath({
+                    repo_name: dir.repo_name,
+                    repo_id: dir.repo_id,
+                    path: dir.path
+                });
+            }
             if (!dir.encrypted) {
                 FileTree.prepareOtherReposTree({cur_repo_id: dir.repo_id});
             }

static/scripts/app/views/group-item.js

@@ -39,7 +39,8 @@ define([
                 var view = new GroupRepoView({
                     model: new Backbone.Model(item, {collection: groupRepos}), 
                     group_id: group_id,
-                    is_staff: is_staff
+                    is_staff: is_staff,
+                    show_shared_by: false // don't show 'Shared By'
                 }); 
                 $listContainer.append(view.render().el);
             });

static/scripts/app/views/group-repo.js

@@ -21,6 +21,11 @@ define([
             this.group_id = options.group_id;
             this.is_staff = options.is_staff;
 
+            this.show_shared_by = true; // default
+            if (options.show_shared_by !== undefined) { // e.g. views/group-item.js
+                this.show_shared_by = options.show_shared_by;
+            }
+
             this.listenTo(this.model, 'destroy', this.remove);
         },
 
@@ -32,7 +37,8 @@ define([
                 // for '#groups' (no 'share_from_me')
                 share_from_me: app.pageOptions.username == this.model.get('owner') ? true : false,
                 // 'owner_name' for '#groups', 'owner_nickname' for '#group/id/'
-                owner_name: this.model.get('owner_nickname') || this.model.get('owner_name')
+                owner_name: this.model.get('owner_nickname') || this.model.get('owner_name'),
+                show_shared_by: this.show_shared_by
             });
             this.$el.html(this.template(obj));
             return this;