From 6c762b865a35d8107a67a82f6954b1f16a2a1033 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 11 Nov 2014 00:05:50 +0800
Subject: [PATCH] bugfix
---
webroot/AutoSa/AutoSa/views.py | 4 ++--
webroot/AutoSa/templates/addAssets.html | 4 ++--
webroot/AutoSa/templates/addPerm.html | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py
index 969e90dd..80c8925d 100644
--- a/webroot/AutoSa/AutoSa/views.py
+++ b/webroot/AutoSa/AutoSa/views.py
@@ -842,7 +842,7 @@ def showPerm(request):
user = User.objects.get(username=username)
for asset_id in assets_del:
- asset = Assets.objects.get(id=asset_id)
+ asset = Assets.objects.get(id=int(asset_id))
asset_user_del = AssetsUser.objects.get(uid=user, aid=asset)
asset_user_del.delete()
return HttpResponseRedirect('/showPerm/?username=%s' % username)
@@ -1080,7 +1080,7 @@ def downFile(request):
def logView(request):
thirtyDayAgo = (datetime.datetime.now() - datetime.timedelta(30))
thirtyDayAgoStamp = int(time.mktime(thirtyDayAgo.timetuple()))
- logs_all = Logs.objects.filter(start_time__gt=thirtyDayAgoStamp)
+ logs_all = Logs.objects.filter(start_time__gt=thirtyDayAgoStamp).order_by("-id")
paginator = Paginator(logs_all, 20)
try:
diff --git a/webroot/AutoSa/templates/addAssets.html b/webroot/AutoSa/templates/addAssets.html
index 65c440b1..be110075 100644
--- a/webroot/AutoSa/templates/addAssets.html
+++ b/webroot/AutoSa/templates/addAssets.html
@@ -28,9 +28,9 @@
<div class="form-group">
<label for="idc" class="col-sm-2 control-label">IDC<span style="color: red"> *</span></label>
<div class="col-sm-4">
- <select name="idc" id="idc">
+ <select name="idc" id="idc" class="form-control">
{% for idc in idcs %}
- <option value="{{ idc.id }}}}">{{ idc.name }}</option>
+ <option value="{{ idc.id }}">{{ idc.name }}</option>
{% endfor %}
</select>
</div>
diff --git a/webroot/AutoSa/templates/addPerm.html b/webroot/AutoSa/templates/addPerm.html
index 2c28bd21..ff505b54 100644
--- a/webroot/AutoSa/templates/addPerm.html
+++ b/webroot/AutoSa/templates/addPerm.html
@@ -26,7 +26,7 @@
{% endfor %}
</tbody>
</table>
- <button class="btn btn-primary">åˆ é™¤</button></td>
+ <button class="btn btn-success">åˆ é™¤</button></td>
</form>
{% endblock %} %}
\ No newline at end of file
--
2.18.0