haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-08 18:30:53 +00:00
Code Issues Releases Wiki Activity

[sysadmin] devices: fix & improvement

Browse Source
This commit is contained in:
llj
2016-06-16 10:29:25 +08:00
parent 5487461541
commit 8c0707c647
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/api2/endpoints/admin/devices.py
View File

@@ -61,7 +61,7 @@ class AdminDevices(APIView):
'has_next_page': has_next_page,
'current_page': current_page
}
return Response((page_info, return_results))
return Response({"page_info": page_info, "devices": return_results})
def delete(self, request, format=None):

2
seahub/templates/js/sysadmin-templates.html
View File

@@ -130,7 +130,7 @@
</script>
<script type="text/template" id="devices-tmpl">
<div class="hd">
<div class="hd ovhd">
<ul class="tab-tabs-nav fleft">
<li class="tab <% if (cur_tab == 'desktop') { %> ui-state-active <% } %>">
<a href="#desktop-devices/" class="a">{% trans "Desktop" %}</a>

4
static/scripts/sysadmin-app/collection/devices.js
View File

@@ -10,13 +10,13 @@ define([
model: DeviceModel,
state: {pageSize: 50},
parseState: function(data) {
return {hasNextPage: data[0].has_next_page, current_page: data[0].current_page};
return data.page_info; // {'has_next_page': has_next_page, 'current_page': current_page}
},
url: function () {
return Common.getUrl({name: 'admin-devices'});
},
parseRecords: function(data) {
return data[1];
return data.devices;
}
});

8
static/scripts/sysadmin-app/views/desktop-devices.js
View File

@@ -49,10 +49,10 @@ define([
getNextPage: function() {
this.initPage();
var current_page = this.deviceCollection.state.current_page;
if (this.deviceCollection.state.hasNextPage) {
if (this.deviceCollection.state.has_next_page) {
this.deviceCollection.getPage(current_page + 1, {
reset: true,
data: {'platform': 'desktop'},
data: {'platform': 'desktop'}
});
}
return false;
@@ -64,7 +64,7 @@ define([
if (current_page > 1) {
this.deviceCollection.getPage(current_page - 1, {
reset: true,
data: {'platform': 'desktop'},
data: {'platform': 'desktop'}
});
}
return false;
@@ -132,7 +132,7 @@ define([
},
renderPaginator: function() {
if (this.deviceCollection.state.hasNextPage) {
if (this.deviceCollection.state.has_next_page) {
this.$jsNext.show();
} else {
this.$jsNext.hide();

8
static/scripts/sysadmin-app/views/mobile-devices.js
View File

@@ -49,10 +49,10 @@ define([
getNextPage: function() {
this.initPage();
var current_page = this.deviceCollection.state.current_page;
if (this.deviceCollection.state.hasNextPage) {
if (this.deviceCollection.state.has_next_page) {
this.deviceCollection.getPage(current_page + 1, {
reset: true,
data: {'platform': 'mobile'},
data: {'platform': 'mobile'}
});
}
@@ -65,7 +65,7 @@ define([
if (current_page > 1) {
this.deviceCollection.getPage(current_page - 1, {
reset: true,
data: {'platform': 'mobile'},
data: {'platform': 'mobile'}
});
}
return false;
@@ -133,7 +133,7 @@ define([
},
renderPaginator: function() {
if (this.deviceCollection.state.hasNextPage) {
if (this.deviceCollection.state.has_next_page) {
this.$jsNext.show();
} else {
this.$jsNext.hide();