Commit 301e02bc authored by ibuler's avatar ibuler

Update some api

parent 70da177e
...@@ -64,10 +64,3 @@ class TerminalHeatbeatViewSet(viewsets.ModelViewSet): ...@@ -64,10 +64,3 @@ class TerminalHeatbeatViewSet(viewsets.ModelViewSet):
terminal = request.user.terminal terminal = request.user.terminal
TerminalHeatbeat.objects.create(terminal=terminal) TerminalHeatbeat.objects.create(terminal=terminal)
return Response({'msg': 'Success'}, status=201) return Response({'msg': 'Success'}, status=201)
class TestHeatbeat(APIView):
permission_classes = (IsAppUser,)
def post(self, request):
return Response({'hello': 'world'})
\ No newline at end of file
...@@ -122,12 +122,10 @@ $(document).ready(function(){ ...@@ -122,12 +122,10 @@ $(document).ready(function(){
}).on('click', '#btn_terminal_accept', function () { }).on('click', '#btn_terminal_accept', function () {
var $form = $('#form_terminal_accept'); var $form = $('#form_terminal_accept');
function success (data, textStatus, jqXHR) { function success (data, textStatus, jqXHR) {
if (data.success === false) { if (data.success === true) {
console.log(data.msg);
window.location.reload() window.location.reload()
} else { } else {
console.log(data.msg); $('#modal-error').html(data.msg).css('display', 'block');
} }
} }
$form.ajaxSubmit({success: success}); $form.ajaxSubmit({success: success});
......
{% extends '_modal.html' %}
{% load static %}
{% load bootstrap %}
{% load i18n %}
{% block modal_body %}
<form action="" method="post" class="form-horizontal">
{% csrf_token %}
{{ form.name|bootstrap_horizontal }}
{{ form.remote_addr|bootstrap_horizontal }}
{{ form.type|bootstrap_horizontal }}
{{ form.url|bootstrap_horizontal }}
{{ form.comment|bootstrap_horizontal }}
<div class="hr-line-dashed"></div>
<div class="form-group">
<div class="col-sm-4 col-sm-offset-2">
<button class="btn btn-default" type="reset"> {% trans 'Reset' %}</button>
<button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
</div>
</div>
</form>
{% endblock %}
{% block custom_foot_js %}
{% endblock %}
\ No newline at end of file
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
{% load bootstrap %} {% load bootstrap %}
<form action="{% url 'applications:terminal-modal-accept' pk="99991937" %}" method="post" class="form-horizontal" id="form_terminal_accept"> <form action="{% url 'applications:terminal-modal-accept' pk="99991937" %}" method="post" class="form-horizontal" id="form_terminal_accept">
{% csrf_token %} {% csrf_token %}
<p class="alert alert-danger" id="modal-error" style="display: none"></p>
{{ form.name|bootstrap_horizontal }} {{ form.name|bootstrap_horizontal }}
{{ form.remote_addr|bootstrap_horizontal }} {{ form.remote_addr|bootstrap_horizontal }}
{{ form.type|bootstrap_horizontal }} {{ form.type|bootstrap_horizontal }}
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# #
from django.views.generic import ListView, UpdateView, DeleteView, FormView from django.views.generic import ListView, UpdateView, DeleteView, FormView
from django.views.generic.edit import BaseUpdateView
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.urls import reverse_lazy from django.urls import reverse_lazy
...@@ -44,10 +45,14 @@ class TerminalDeleteView(DeleteView): ...@@ -44,10 +45,14 @@ class TerminalDeleteView(DeleteView):
success_url = reverse_lazy('applications:applications-list') success_url = reverse_lazy('applications:applications-list')
class TerminalModelAccept(AdminUserRequiredMixin, JSONResponseMixin, UpdateView): class TerminalModelAccept(AdminUserRequiredMixin, JSONResponseMixin, BaseUpdateView):
model = Terminal model = Terminal
form_class = TerminalForm form_class = TerminalForm
def post(self, request, *args, **kwargs):
print(request.POST)
return super(TerminalModelAccept, self).post(request, *args, **kwargs)
def form_valid(self, form): def form_valid(self, form):
terminal = form.save() terminal = form.save()
terminal.is_accepted = True terminal.is_accepted = True
...@@ -57,14 +62,13 @@ class TerminalModelAccept(AdminUserRequiredMixin, JSONResponseMixin, UpdateView) ...@@ -57,14 +62,13 @@ class TerminalModelAccept(AdminUserRequiredMixin, JSONResponseMixin, UpdateView)
'success': True, 'success': True,
'msg': 'success' 'msg': 'success'
} }
print('Valid')
return self.render_json_response(data) return self.render_json_response(data)
def form_invalid(self, form): def form_invalid(self, form):
print(form.errors) print('form.data')
data = { data = {
'success': False, 'success': False,
'msg': ','.join(form.errors) 'msg': str(form.errors),
} }
return self.render_json_response(data) return self.render_json_response(data)
......
...@@ -65,8 +65,6 @@ class AccessKeyAuthentication(authentication.BaseAuthentication): ...@@ -65,8 +65,6 @@ class AccessKeyAuthentication(authentication.BaseAuthentication):
raise exceptions.AuthenticationFailed(_('Invalid signature.')) raise exceptions.AuthenticationFailed(_('Invalid signature.'))
access_key_secret = access_key.secret access_key_secret = access_key.secret
print(request_date)
try: try:
request_unix_time = http_to_unixtime(request_date) request_unix_time = http_to_unixtime(request_date)
except ValueError: except ValueError:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment