1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 00:00:00 +00:00

Fixed typos

This commit is contained in:
zhengxie
2013-03-30 21:08:50 +08:00
parent ccd2605af1
commit 000e9aa0ea
3 changed files with 16 additions and 20 deletions

View File

@@ -478,7 +478,7 @@ def repo_history(request, repo_id):
try:
current_page = int(request.GET.get('page', '1'))
per_page= int(request.GET.get('per_page', '25'))
per_page = int(request.GET.get('per_page', '25'))
except ValueError:
current_page = 1
per_page = 25
@@ -527,7 +527,7 @@ def repo_view_snapshot(request, repo_id):
try:
current_page = int(request.GET.get('page', '1'))
per_page= int(request.GET.get('per_page', '25'))
per_page = int(request.GET.get('per_page', '25'))
except ValueError:
current_page = 1
per_page = 25
@@ -746,7 +746,7 @@ def myhome(request):
owned_repos.sort(lambda x, y: cmp(y.latest_modify, x.latest_modify))
# Personal repos others shared to me
in_repos = list_personal_shared_repos(email,'to_email', -1, -1)
in_repos = list_personal_shared_repos(email, 'to_email', -1, -1)
# For each group I joined...
for grp in joined_groups:
# Get group repos, and for each group repos...
@@ -1014,7 +1014,7 @@ def repo_del_file(request, repo_id):
file_name = request.GET.get("file_name")
user = request.user.username
try:
seafserv_threaded_rpc.del_file(repo_id, parent_dir,file_name, user)
seafserv_threaded_rpc.del_file(repo_id, parent_dir, file_name, user)
messages.success(request, _(u'%s successfully deleted.') % file_name)
except:
messages.error(request, _(u'Internal error. Failed to delete %s.') % file_name)
@@ -1026,7 +1026,7 @@ def file_comment(request):
if request.method == 'POST':
# handle post request to leave comment on a file
content_type = 'application/json; charset=utf-8'
path = request.GET.get('p', '');
path = request.GET.get('p', '')
f = FileCommentForm(request.POST)
if f.is_valid():
@@ -1447,7 +1447,7 @@ def user_info(request, email):
if CALC_SHARE_USAGE:
try:
share_usage = seafserv_threaded_rpc.get_user_share_usage(email)
except SearcpError, e:
except SearpcError, e:
share_usage = 0
quota_usage = my_usage + share_usage
else:
@@ -2458,7 +2458,7 @@ def i18n(request):
@login_required
def repo_star_file(request, repo_id):
path = request.POST.get('path')
state = request.POST.get('state');
state = request.POST.get('state')
content_type = 'application/json; charset=utf-8'

View File

@@ -32,8 +32,8 @@ from base.decorators import ctx_switch_required, repo_passwd_set_required
from base.models import UuidObjidMap, FileComment
from contacts.models import Contact
from share.models import FileShare
from seahub.utils import get_httpserver_root, show_delete_days, render_error,\
get_file_type_and_ext, gen_file_get_url, gen_shared_link, is_file_starred,\
from seahub.utils import get_httpserver_root, show_delete_days, render_error, \
get_file_type_and_ext, gen_file_get_url, gen_shared_link, is_file_starred, \
get_file_contributors, get_ccnetapplet_root, render_permission_error, \
is_textual_file, show_delete_days
from seahub.utils.file_types import (IMAGE, PDF, IMAGE, DOCUMENT, MARKDOWN, \
@@ -67,7 +67,7 @@ def gen_path_link(path, repo_name):
links = []
if path and path != '/':
paths = path[1:-1].split('/')
i=1
i = 1
for name in paths:
link = '/' + '/'.join(paths[:i])
i = i + 1

View File

@@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
from django.core.urlresolvers import reverse
from django.contrib.sites.models import Site, RequestSite
from django.http import HttpResponse, HttpResponseBadRequest, Http404, \
HttpResponseRedirect
from django.contrib.sites.models import RequestSite
from django.http import Http404, HttpResponseRedirect
from django.template.loader import render_to_string
from django.views.generic.base import TemplateView, TemplateResponseMixin
from django.views.generic.edit import BaseFormView, FormMixin
from django.views.generic.edit import BaseFormView
from seaserv import server_repo_size, is_passwd_set, get_commits, get_repo, \
get_org_groups_by_repo, get_shared_groups_by_repo, is_group_user, \
check_quota, MAX_UPLOAD_FILE_SIZE, web_get_access_token, is_repo_owner, \
@@ -116,7 +115,7 @@ class RepoView(LoginRequiredMixin, CtxSwitchRequiredMixin, RepoMixin,
if self.user.is_authenticated():
accessible_repos = get_accessible_repos(self.request, self.repo)
else:
accessible_repos = []
accessible_repos = []
return accessible_repos
def get_repo_shared_groups(self):
@@ -176,9 +175,6 @@ class RepoView(LoginRequiredMixin, CtxSwitchRequiredMixin, RepoMixin,
def get_shared_link(self, fileshare):
# dir shared link
http_or_https = self.request.is_secure() and 'https' or 'http'
domain = RequestSite(self.request).domain
if fileshare:
dir_shared_link = gen_shared_link(self.request, fileshare.token, 'd')
else:
@@ -247,10 +243,10 @@ class RepoHistoryView(LoginRequiredMixin, CtxSwitchRequiredMixin, RepoMixin,
def get_current_commit(self):
commit_id = self.request.GET.get('commit_id', '')
if not commit_id:
return HttpResponseRedirect(reverse('repo', args=[repo_id]))
return HttpResponseRedirect(reverse('repo', args=[self.repo.id]))
current_commit = get_commit(commit_id)
if not current_commit:
current_commit = get_commits(repo_id, 0, 1)[0]
current_commit = get_commits(self.repo.id, 0, 1)[0]
return current_commit
def get_context_data(self, **kwargs):