haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-04-28 03:10:45 +00:00
Code Issues Releases Wiki Activity

Modify profile page, and remove ccnet conf related fucntion

Browse Source
This commit is contained in:
xiez 2012-04-18 21:53:37 +08:00
parent 87a3f94e88
commit cfd96c763d
4 changed files with 4 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
profile/templates/profile/profile.html
View File

@ -1,42 +0,0 @@
{% extends "profile/profile_base.html" %}
{% block left_panel %}
<h3>操作</h3>
<ul>
<li><a href="{{ SITE_ROOT }}accounts/password/change/">修改网站帐号密码</a></li>
<li><a href="{{ SITE_ROOT}}profile/userids/">列出所有计算机</a></li>
</ul>
{% endblock %}
{% block right_panel %}
<h2>当前设置</h2>
<ul>
<li><span class="bold">提示：</span>如需上传配置文件，请在本地 seafile 界面 "配置" 标签下上传</li>
</ur>
<table class="profile-dict">
<tr>
<th width="33%">计算机</th>
<th width="67">配置文件上传时间</th>
</tr>
{% if profile_dict %}
{% for peername,profile_ts in profile_dict.items %}
<tr>
<td>{{ peername }}</td>
{% if profile_ts %}
<td>上传于{{ profile_ts }} <a href="{{ SITE_ROOT }}profile/download/?user_id={{ user_id }}">点此下载</a></td>
{% else %}
<td>未上传</td>
{% endif %}
</tr>
{% endfor %}
{% else %}
<tr>
<td>暂无</td>
<td>—— ——</td>
</tr>
{% endif %}
</table>
{% endblock %}

1
profile/templates/profile/user_ids.html
View File

@ -5,7 +5,6 @@
<h3>操作</h3>
<ul>
<li><a href="{{ SITE_ROOT }}accounts/password/change/">修改网站帐号密码</a></li>
<li><a href="{{ SITE_ROOT}}profile/userids/">列出所有计算机</a></li>
</ul>
{% endblock %}

10
profile/urls.py
View File

@ -1,10 +1,8 @@
from django.conf.urls.defaults import *
urlpatterns = patterns('profile.views',
url(r'^$', 'show_profile'),
url(r'^ccnet/$', 'get_ccnet_profile'),
# url(r'^edit/$', 'set_profile', name="profile_setting"),
url(r'^edit/ccnet/$', 'set_ccnet_profile', name="ccnet_profile_setting"),
url(r'^download/$', 'download_profile', name="profile_download"),
url(r'userids/$', 'list_userids', name="list_userids")
url(r'^$', 'list_userids', name="list_userids"),
# url(r'^ccnet/$', 'get_ccnet_profile'),
# url(r'^edit/ccnet/$', 'set_ccnet_profile', name="ccnet_profile_setting"),
# url(r'^download/$', 'download_profile', name="profile_download"),
)

29
profile/views.py
View File

@ -12,35 +12,6 @@ from models import UserCcnetConf
from seaserv import ccnet_rpc, translate_time_usec, get_binding_userids
@login_required
def show_profile(request):
userid_list = get_binding_userids(request.user.username)
profile_dict = {}
for user_id in userid_list:
try:
profile_timestamp = ccnet_rpc.get_user_profile_timestamp(user_id)
profile_timestamp = translate_time_usec(profile_timestamp)
except:
profile_timestamp = None
try:
peernames = ccnet_rpc.get_peernames_by_userid(user_id)
for peername in peernames.split('\n'):
if not peername:
continue
profile_dict[peername] = profile_timestamp
except:
pass
return render_to_response('profile/profile.html', {
'userid_list': userid_list,
'profile_dict': profile_dict,
},
context_instance=RequestContext(request))
@login_required
def get_ccnet_profile(request):
try: