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

Fixed sys publink bug

Browse Source
This commit is contained in:
zhengxie
2013-08-09 17:35:08 +08:00
parent a874c03fee
commit 6e0f2729de
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
seahub/templates/sysadmin/sys_publink_admin.html
View File

@@ -27,10 +27,10 @@
<div id="paginator"> <div id="paginator">
{% if current_page != 1 %} {% if current_page != 1 %}
<a href="{{ SITE_ROOT }}sys/seafadmin/?page={{ prev_page }}&per_page={{ per_page }}">{% trans "Previous" %}</a> <a href="?page={{ prev_page }}&per_page={{ per_page }}">{% trans "Previous" %}</a>
{% endif %} {% endif %}
{% if page_next %} {% if page_next %}
<a href="{{ SITE_ROOT }}sys/seafadmin/?page={{ next_page }}&per_page={{ per_page }}">{% trans "Next" %}</a> <a href="?page={{ next_page }}&per_page={{ per_page }}">{% trans "Next" %}</a>
{% endif %} {% endif %}
{% if current_page != 1 or page_next %} {% if current_page != 1 or page_next %}
| |
@@ -39,17 +39,17 @@
{% if per_page == 25 %} {% if per_page == 25 %}
<span> 25 </span> <span> 25 </span>
{% else %} {% else %}
<a href="{{ SITE_ROOT }}sys/seafadmin/?per_page=25" class="per-page">25</a> <a href="?per_page=25" class="per-page">25</a>
{% endif %} {% endif %}
{% if per_page == 50 %} {% if per_page == 50 %}
<span> 50 </span> <span> 50 </span>
{% else %} {% else %}
<a href="{{ SITE_ROOT }}sys/seafadmin/?per_page=50" class="per-page">50</a> <a href="?per_page=50" class="per-page">50</a>
{% endif %} {% endif %}
{% if per_page == 100 %} {% if per_page == 100 %}
<span> 100 </span> <span> 100 </span>
{% else %} {% else %}
<a href="{{ SITE_ROOT }}sys/seafadmin/?per_page=100" class="per-page">100</a> <a href="?per_page=100" class="per-page">100</a>
{% endif %} {% endif %}
</div> </div>
{% else %} {% else %}

9
seahub/views/sysadmin.py
View File

@@ -394,7 +394,12 @@ def sys_publink_admin(request):
per_page = 100 per_page = 100
publinks = FileShare.objects.all()[per_page * (current_page -1): publinks = FileShare.objects.all()[per_page * (current_page -1):
per_page + 1] per_page + 1]
if len(publinks) == per_page + 1:
page_next = True
else:
page_next = False
for l in publinks: for l in publinks:
if l.s_type == 'f': if l.s_type == 'f':
l.name = os.path.basename(l.path) l.name = os.path.basename(l.path)
@@ -408,6 +413,6 @@ def sys_publink_admin(request):
'prev_page': current_page-1, 'prev_page': current_page-1,
'next_page': current_page+1, 'next_page': current_page+1,
'per_page': per_page, 'per_page': per_page,
'page_next': True, 'page_next': page_next,
}, },
context_instance=RequestContext(request)) context_instance=RequestContext(request))