Commit e817715d authored by ibuler's avatar ibuler

fix asset update bug

parent 9c0825ce
...@@ -451,7 +451,7 @@ def asset_update(request): ...@@ -451,7 +451,7 @@ def asset_update(request):
return HttpResponseRedirect(reverse('asset_detail')+'?id=%s' % asset_id) return HttpResponseRedirect(reverse('asset_detail')+'?id=%s' % asset_id)
else: else:
asset_ansible_update([asset], name) asset_ansible_update([asset], name)
return HttpResponseRedirect(reverse('asset_detail')+'/?id=%s' % asset_id) return HttpResponseRedirect(reverse('asset_detail')+'?id=%s' % asset_id)
@require_role('admin') @require_role('admin')
......
#coding: utf8 #coding: utf8
[base] [base]
url = http://yourIP url = http://j
key = 16位字母数字 key = 88aaaf7ffe3c6c04
log = debug | warning log = debug
[db] [db]
host = 127.0.0.1 host = 127.0.0.1
...@@ -13,12 +13,12 @@ password = mysql234 ...@@ -13,12 +13,12 @@ password = mysql234
database = jumpserver database = jumpserver
[websocket] [websocket]
web_socket_host = yourIP|yourDomainName:3000 web_socket_host = j:3000
[mail] [mail]
mail_enable = 1 mail_enable = 1
email_host = yourSMTPHost email_host = smtp.exmail.qq.com
email_port = yourSMTPHost|25 email_port = 25
email_host_user = yourEmail email_host_user = noreply@jumpserver.org
email_host_password = yourEmailPassword email_host_password = jumpserver1234
email_use_tls = True email_use_tls = True
...@@ -14,6 +14,7 @@ urlpatterns = patterns('jumpserver.views', ...@@ -14,6 +14,7 @@ urlpatterns = patterns('jumpserver.views',
url(r'^setting', 'setting', name='setting'), url(r'^setting', 'setting', name='setting'),
url(r'^terminal/$', 'web_terminal', name='terminal'), url(r'^terminal/$', 'web_terminal', name='terminal'),
url(r'^install/$', 'install', name='install'), url(r'^install/$', 'install', name='install'),
url(r'^install/test/(\w+)/$', 'install_test', name='install_test'),
url(r'^juser/', include('juser.urls')), url(r'^juser/', include('juser.urls')),
url(r'^jasset/', include('jasset.urls')), url(r'^jasset/', include('jasset.urls')),
url(r'^jlog/', include('jlog.urls')), url(r'^jlog/', include('jlog.urls')),
......
...@@ -357,4 +357,16 @@ def web_terminal(request): ...@@ -357,4 +357,16 @@ def web_terminal(request):
def install(request): def install(request):
return render_to_response('test.html', locals()) return render_to_response('install.html', locals())
def install_test(request, offset):
if offset == 'db':
db_host = request.GET.get('db_host')
db_port = request.GET.get('db_port')
db_user = request.GET.get('db_user')
db_pass = request.GET.get('db_pass')
db = request.GET.get('db')
This diff is collapsed.
This diff is collapsed.
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