haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 23:20:51 +00:00
Code Issues Releases Wiki Activity

Change public repo to innerpub repo

Browse Source
This commit is contained in:
xiez
2012-08-21 17:28:26 +08:00
parent 98142ab219
commit 7c4884a7f4
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
thirdpart/seaserv/__init__.py
View File

@@ -8,7 +8,7 @@ from service import get_org_groups, get_personal_groups, get_group_repoids, \
check_group_staff, remove_group_user, get_group, get_org_id_by_group, \
get_group_members, get_shared_groups_by_repo, is_group_user
from service import get_repos, get_repo, get_commits, get_branches, \
get_org_repos, is_repo_owner, create_org_repo, is_public_repo
get_org_repos, is_repo_owner, create_org_repo, is_innerpub_repo
from service import get_binding_peerids, is_valid_filename
from service import create_org, get_orgs_by_user, get_org_by_url_prefix, \
get_user_current_org, add_org_user, remove_org_user, get_org_by_id, \

4
thirdpart/seaserv/service.py
View File

@@ -340,12 +340,12 @@ def is_valid_filename(file_or_dir):
return ret
def is_public_repo(repo_id):
def is_innerpub_repo(repo_id):
"""
Check whether a repo is public.
"""
try:
ret = seafserv_threaded_rpc.is_public_repo(repo_id)
ret = seafserv_threaded_rpc.is_innerpub_repo(repo_id)
except SearpcError:
ret = 0

8
views.py
View File

@@ -30,7 +30,7 @@ from auth.tokens import default_token_generator
from share.models import FileShare
from seaserv import ccnet_rpc, ccnet_threaded_rpc, get_repos, get_emailusers, \
get_repo, get_commits, get_branches, is_valid_filename, remove_group_user,\
seafserv_threaded_rpc, seafserv_rpc, get_binding_peerids, is_public_repo, \
seafserv_threaded_rpc, seafserv_rpc, get_binding_peerids, is_innerpub_repo, \
get_group_repoids, check_group_staff, get_personal_groups, is_repo_owner, \
get_group, get_shared_groups_by_repo, is_group_user
from pysearpc import SearpcError
@@ -125,7 +125,7 @@ def access_to_repo(request, repo_id, repo_ap):
"""
if validate_owner(request, repo_id) or check_shared_repo(request, repo_id)\
or access_org_repo(request, repo_id) or is_public_repo(repo_id):
or access_org_repo(request, repo_id) or is_innerpub_repo(repo_id):
return True
else:
return False
@@ -692,7 +692,7 @@ def public_home(request):
Show public home page when CLOUD_MODE is False.
"""
users = get_emailusers(-1, -1)
public_repos = seafserv_threaded_rpc.list_public_repos()
public_repos = seafserv_threaded_rpc.list_innerpub_repos()
calculate_repo_last_modify(public_repos)
public_repos.sort(lambda x, y: cmp(y.latest_modify, x.latest_modify))
@@ -722,7 +722,7 @@ def public_repo_create(request):
user = request.user.username
try:
repo_id = seafserv_threaded_rpc.create_public_repo(repo_name,
repo_id = seafserv_threaded_rpc.create_innerpub_repo(repo_name,
repo_desc,
user, passwd)
except: