github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Finish url namespace change

pull/530/head
ibuler 2016-11-16 17:45:46 +08:00
parent a5e487441f
commit 5745c8cc4a
16 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/templates/assets/admin_user_list.html
View File

@ -52,7 +52,7 @@ $(document).ready(function(){
var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn_admin_user_delete" data-uid="99991937">{% trans "Delete" %}</a>'.replace('99991937', cellData); var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn_admin_user_delete" data-uid="99991937">{% trans "Delete" %}</a>'.replace('99991937', cellData);
$(td).html(script_btn + update_btn + del_btn) $(td).html(script_btn + update_btn + del_btn)
}}], }}],
ajax_url: '{% url "assets:api-admin-user-list" %}', ajax_url: '{% url "api-assets:admin-user-list" %}',
columns: [{data: function(){return ""}}, {data: "name" }, {data: "username" }, {data: "assets_amount" }, {data: function () {return 'lost'} }, columns: [{data: function(){return ""}}, {data: "name" }, {data: "username" }, {data: "assets_amount" }, {data: function () {return 'lost'} },
{data: "comment" }, {data: "id" }], {data: "comment" }, {data: "id" }],
op_html: $('#actions').html() op_html: $('#actions').html()

4
apps/assets/templates/assets/asset_list.html
View File

@ -72,7 +72,7 @@
</td> </td>
<td class="text-center"> <td class="text-center">
<a href="{% url 'assets:asset-update' pk=asset.id %}" class="btn btn-xs btn-info">{% trans 'Update' %}</a> <a href="{% url 'assets:asset-update' pk=asset.id %}" class="btn btn-xs btn-info">{% trans 'Update' %}</a>
<a onclick="objectDelete(this,'{{ asset.hostname }}','{% url 'assets:api-asset-detail' pk=asset.id %}')" class="btn btn-xs btn-danger del"> <a onclick="objectDelete(this,'{{ asset.hostname }}','{% url 'api-assets:asset-detail' pk=asset.id %}')" class="btn btn-xs btn-danger del">
{% trans 'Delete' %}</a> {% trans 'Delete' %}</a>
</td> </td>
</tr> </tr>
@ -190,7 +190,7 @@
var column2 = table.rows('.selected').data(); var column2 = table.rows('.selected').data();
var id_list = []; var id_list = [];
var plain_id_list = []; var plain_id_list = [];
var the_url = "{% url 'assets:api-asset-bulk-update' %}"; var the_url = "{% url 'api-assets:asset-bulk-update' %}";
for(var i=0;i<column2.length;i++){ for(var i=0;i<column2.length;i++){
id_list.push({id: column2[i].id,hostname:column2[i].ip}); id_list.push({id: column2[i].id,hostname:column2[i].ip});
plain_id_list.push(parseInt(column2[i].id)); plain_id_list.push(parseInt(column2[i].id));

2
apps/assets/templates/assets/idc_assets.html
View File

@ -118,7 +118,7 @@
$(td).html('<i class="fa fa-check text-navy"></i>') $(td).html('<i class="fa fa-check text-navy"></i>')
} }
}}], }}],
ajax_url: '{% url "assets:api-asset-list" %}?idc={{ idc.id }}', ajax_url: '{% url "api-assets:asset-list" %}?idc={{ idc.id }}',
columns: [{data: function(){return ""}}, {data: "hostname" }, {data: "ip" }, {data: "port" }, columns: [{data: function(){return ""}}, {data: "hostname" }, {data: "ip" }, {data: "port" },
{data: "type" }, {data: "is_active" }] {data: "type" }, {data: "is_active" }]
}; };

2
apps/assets/templates/assets/idc_list.html
View File

@ -50,7 +50,7 @@ $(document).ready(function(){
var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn_user_delete" data-uid="99991937">{% trans "Delete" %}</a>'.replace('99991937', cellData); var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn_user_delete" data-uid="99991937">{% trans "Delete" %}</a>'.replace('99991937', cellData);
$(td).html(update_btn + del_btn) $(td).html(update_btn + del_btn)
}}], }}],
ajax_url: '{% url "assets:api-idc-list" %}', ajax_url: '{% url "api-assets:idc-list" %}',
columns: [{data: function(){return ""}}, {data: "name" }, {data: "assets_amount" }, {data: "contact" }, {data: "phone" }, columns: [{data: function(){return ""}}, {data: "name" }, {data: "assets_amount" }, {data: "contact" }, {data: "phone" },
{data: "operator" }, {data: "id" }], {data: "operator" }, {data: "id" }],
op_html: $('#actions').html() op_html: $('#actions').html()

4
apps/perms/urls.py
View File

@ -34,12 +34,12 @@ urlpatterns += [
# Select user permission of asset and asset group # Select user permission of asset and asset group
url(r'^v1/user/(?P<pk>[0-9]+)/assets/$', api.UserGrantedAssetsApi.as_view(), name='user-assets'), url(r'^v1/user/(?P<pk>[0-9]+)/assets/$', api.UserGrantedAssetsApi.as_view(), name='user-assets'),
url(r'^v1/user/(?P<pk>[0-9]+)/asset-groups/$', api.UserGrantedAssetGroupsApi.as_view(), url(r'^v1/user/(?P<pk>[0-9]+)/asset-groups/$', api.UserGrantedAssetGroupsApi.as_view(),
name='api-user-asset-groups'), name='user-asset-groups'),
# Select user group permission of asset and asset group # Select user group permission of asset and asset group
url(r'^v1/user-group/(?P<pk>[0-9]+)/assets/$', api.UserGroupGrantedAssetsApi.as_view(), name='user-group-assets'), url(r'^v1/user-group/(?P<pk>[0-9]+)/assets/$', api.UserGroupGrantedAssetsApi.as_view(), name='user-group-assets'),
url(r'^v1/user-group/(?P<pk>[0-9]+)/asset-groups/$', api.UserGroupGrantedAssetGroupsApi.as_view(), url(r'^v1/user-group/(?P<pk>[0-9]+)/asset-groups/$', api.UserGroupGrantedAssetGroupsApi.as_view(),
name='api-user-group-asset-groups'), name='user-group-asset-groups'),
# Revoke permission api # Revoke permission api

4
apps/terminal/templates/terminal/terminal_list.html
View File

@ -73,7 +73,7 @@ $(document).ready(function(){
$(td).html(update_btn + delete_btn) $(td).html(update_btn + delete_btn)
}} }}
], ],
ajax_url: '{% url "terminal:api-terminal-list" %}', ajax_url: '{% url "api-terminal:terminal-list" %}',
columns: [{data: function(){return ""}}, {data: "name" }, {data: "ip" }, {data: "get_type_display" }, columns: [{data: function(){return ""}}, {data: "name" }, {data: "ip" }, {data: "get_type_display" },
{data: "proxy_online"}, {data: "is_active" }, {data: 'is_active'}, {data: "id"}], {data: "proxy_online"}, {data: "is_active" }, {data: 'is_active'}, {data: "id"}],
op_html: $('#actions').html() op_html: $('#actions').html()
@ -83,7 +83,7 @@ $(document).ready(function(){
var $this = $(this); var $this = $(this);
var uid = $this.data('uid'); var uid = $this.data('uid');
var name = $(this).data('name'); var name = $(this).data('name');
var the_url = '{% url "terminal:api-terminal-detail" pk=99991937 %}'.replace('99991937', uid); var the_url = '{% url "api-terminal:terminal-detail" pk=99991937 %}'.replace('99991937', uid);
objectDelete($this, name, the_url) objectDelete($this, name, the_url)
}) })
</script> </script>

4
apps/terminal/urls.py
View File

@ -16,8 +16,8 @@ urlpatterns = [
] ]
router = routers.DefaultRouter() router = routers.DefaultRouter()
router.register(r'v1/terminal/heatbeat', api.TerminalHeatbeatViewSet, 'api-terminal-heatbeat') router.register(r'v1/terminal/heatbeat', api.TerminalHeatbeatViewSet, 'terminal-heatbeat')
router.register(r'v1/terminal', api.TerminalViewSet, 'api-terminal') router.register(r'v1/terminal', api.TerminalViewSet, 'terminal')
# urlpatterns += [ # urlpatterns += [
# url(r'v1/terminal/heatbeat/', api.TerminalHeatbeatApi.as_view(), name='api-terminal-heatbeat') # url(r'v1/terminal/heatbeat/', api.TerminalHeatbeatApi.as_view(), name='api-terminal-heatbeat')
# ] # ]

2
apps/users/templates/users/user_asset_permission.html
View File

@ -158,7 +158,7 @@
} }
}} }}
], ],
ajax_url: '{% url "perms:api-asset-permission-list" %}?user={{ user.id }}', ajax_url: '{% url "api-perms:asset-permission-list" %}?user={{ user.id }}',
columns: [{data: function(){return ""}}, {data: "name" }, {data: "assets" }, {data: "asset_groups"}, columns: [{data: function(){return ""}}, {data: "name" }, {data: "assets" }, {data: "asset_groups"},
{data: "system_users"}, {data: "is_active"}, {data: "id"}] {data: "system_users"}, {data: "is_active"}, {data: "id"}]
}; };

12
apps/users/templates/users/user_detail.html
View File

@ -228,7 +228,7 @@
jumpserver.groups_selected = {}; jumpserver.groups_selected = {};
function updateUserGroups(groups) { function updateUserGroups(groups) {
var the_url = "{% url 'users:api-user-update-group' pk=user.id %}"; var the_url = "{% url 'api-users:user-update-group' pk=user.id %}";
var body = { var body = {
groups: Object.assign([], groups) groups: Object.assign([], groups)
}; };
@ -265,7 +265,7 @@ $(document).ready(function() {
delete jumpserver.groups_selected[data.id] delete jumpserver.groups_selected[data.id]
}) })
}).on('click', '#is_active', function() { }).on('click', '#is_active', function() {
var the_url = "{% url 'users:api-user-detail' pk=user.id %}"; var the_url = "{% url 'api-users:user-detail' pk=user.id %}";
var checked = $(this).prop('checked'); var checked = $(this).prop('checked');
var body = { var body = {
'is_active': checked 'is_active': checked
@ -277,7 +277,7 @@ $(document).ready(function() {
success_message: success success_message: success
}); });
}).on('click', '#enable_otp', function() { }).on('click', '#enable_otp', function() {
var the_url = "{% url 'users:api-user-detail' pk=user.id %}"; var the_url = "{% url 'api-users:user-detail' pk=user.id %}";
var checked = $(this).prop('checked'); var checked = $(this).prop('checked');
var body = { var body = {
'enable_otp': checked 'enable_otp': checked
@ -316,7 +316,7 @@ $(document).ready(function() {
updateUserGroups(groups) updateUserGroups(groups)
}).on('click', '#btn_reset_password', function() { }).on('click', '#btn_reset_password', function() {
function doReset() { function doReset() {
var the_url = '{% url "users:api-user-reset-password" pk=user.id %}'; var the_url = '{% url "api-users:user-reset-password" pk=user.id %}';
var body = {}; var body = {};
var success = function() { var success = function() {
var msg = "{% trans "An e-mail has been sent to the user\'s mailbox." %}"; var msg = "{% trans "An e-mail has been sent to the user\'s mailbox." %}";
@ -341,7 +341,7 @@ $(document).ready(function() {
}); });
}).on('click', '#btn_reset_pk', function() { }).on('click', '#btn_reset_pk', function() {
function doReset() { function doReset() {
var the_url = '{% url "users:api-user-reset-pk" pk=user.id %}'; var the_url = '{% url "api-users:user-reset-pk" pk=user.id %}';
var body = {}; var body = {};
var success = function() { var success = function() {
var msg = "{% trans 'The reset-ssh-public-key E-mail has been sent successfully. Please inform the user to update his new ssh public key.' %}"; var msg = "{% trans 'The reset-ssh-public-key E-mail has been sent successfully. Please inform the user to update his new ssh public key.' %}";
@ -367,7 +367,7 @@ $(document).ready(function() {
}).on('click', '#btn_user_update_pk', function(){ }).on('click', '#btn_user_update_pk', function(){
var $this = $(this); var $this = $(this);
var pk = $('#txt_pk').val(); var pk = $('#txt_pk').val();
var the_url = '{% url "users:api-user-update-pk" pk=user.id %}'; var the_url = '{% url "api-users:user-update-pk" pk=user.id %}';
var body = {'_public_key': pk}; var body = {'_public_key': pk};
var success = function() { var success = function() {
$('#txt_pk').val(''); $('#txt_pk').val('');

4
apps/users/templates/users/user_granted_asset.html
View File

@ -133,7 +133,7 @@
} }
}} }}
], ],
ajax_url: '{% url "perms:api-user-assets" pk=user.id %}', ajax_url: '{% url "api-perms:user-assets" pk=user.id %}',
columns: [{data: function(){return ""}}, {data: "hostname" }, {data: "ip" }, {data: "port"}, columns: [{data: function(){return ""}}, {data: "hostname" }, {data: "ip" }, {data: "port"},
{data: "system_users_join"}, {data: "is_active"}] {data: "system_users_join"}, {data: "is_active"}]
}; };
@ -148,7 +148,7 @@
$(td).html(detail_btn.replace('99991937', rowData.id)); $(td).html(detail_btn.replace('99991937', rowData.id));
}} }}
], ],
ajax_url: '{% url "perms:api-user-asset-groups" pk=user.id %}', ajax_url: '{% url "api-perms:user-asset-groups" pk=user.id %}',
columns: [{data: function(){return ""}}, {data: "name" }, {data: "assets_amount" }] columns: [{data: function(){return ""}}, {data: "name" }, {data: "assets_amount" }]
}; };
jumpserver.initDataTable(options); jumpserver.initDataTable(options);

2
apps/users/templates/users/user_group_asset_permission.html
View File

@ -154,7 +154,7 @@
$(td).html(btn) $(td).html(btn)
}} }}
], ],
ajax_url: '{% url "perms:api-asset-permission-list" %}?user_group={{ user_group.id }}', ajax_url: '{% url "api-perms:asset-permission-list" %}?user_group={{ user_group.id }}',
columns: [{data: function(){return ""}}, {data: "name" }, {data: "assets" }, {data: "asset_groups"}, columns: [{data: function(){return ""}}, {data: "name" }, {data: "assets" }, {data: "asset_groups"},
{data: "system_users"}, {data: "is_active"}, {data: "id"}] {data: "system_users"}, {data: "is_active"}, {data: "id"}]
}; };

2
apps/users/templates/users/user_group_detail.html
View File

@ -119,7 +119,7 @@
jumpserver.users_selected = {}; jumpserver.users_selected = {};
function updateGroupMember(users) { function updateGroupMember(users) {
var the_url = "{% url 'users:api-user-group-update-user' pk=user_group.id %}"; var the_url = "{% url 'api-users:user-group-update-user' pk=user_group.id %}";
var body = { var body = {
users: Object.assign([], users) users: Object.assign([], users)
}; };

2
apps/users/templates/users/user_group_granted_asset.html
View File

@ -148,7 +148,7 @@
$(td).html(detail_btn.replace('99991937', rowData.id)); $(td).html(detail_btn.replace('99991937', rowData.id));
}} }}
], ],
ajax_url: '{% url "perms:api-user-group-asset-groups" pk=user_group.id %}', ajax_url: '{% url "api-perms:user-group-asset-groups" pk=user_group.id %}',
columns: [{data: function(){return ""}}, {data: "name" }, {data: "assets_amount" }] columns: [{data: function(){return ""}}, {data: "name" }, {data: "assets_amount" }]
}; };
jumpserver.initDataTable(options); jumpserver.initDataTable(options);

6
apps/users/templates/users/user_group_list.html
View File

@ -55,7 +55,7 @@ $(document).ready(function() {
$(td).html(update_btn + del_btn) $(td).html(update_btn + del_btn)
} }
}}], }}],
ajax_url: '{% url "users:api-user-group-list" %}', ajax_url: '{% url "api-users:user-group-list" %}',
columns: [{data: function(){return ""}}, {data: "name" }, {data: "user_amount"}, columns: [{data: function(){return ""}}, {data: "name" }, {data: "user_amount"},
{data: "comment"}, {data: "id" }], {data: "comment"}, {data: "id" }],
op_html: $('#actions').html() op_html: $('#actions').html()
@ -65,7 +65,7 @@ $(document).ready(function() {
var $this = $(this); var $this = $(this);
function doDelete() { function doDelete() {
var group_id = $this.data('gid'); var group_id = $this.data('gid');
var the_url = "{% url 'users:api-user-group-detail' pk=99991937 %}".replace('99991937', group_id); var the_url = "{% url 'api-users:user-group-detail' pk=99991937 %}".replace('99991937', group_id);
var body = {}; var body = {};
var success = function() { var success = function() {
var msg = "{% trans 'Group Deleted.' %}"; var msg = "{% trans 'Group Deleted.' %}";
@ -105,7 +105,7 @@ $(document).ready(function() {
if (plain_id_list === []) { if (plain_id_list === []) {
return false; return false;
} }
var the_url = "{% url 'users:api-user-group-list' %}"; var the_url = "{% url 'api-users:user-group-list' %}";
function doDelete() { function doDelete() {
swal({ swal({
title: "{% trans 'Are you sure?' %}", title: "{% trans 'Are you sure?' %}",

8
apps/users/templates/users/user_list.html
View File

@ -81,7 +81,7 @@ $(document).ready(function(){
$(td).html(update_btn + del_btn) $(td).html(update_btn + del_btn)
} }
}}], }}],
ajax_url: '{% url "users:api-user-list" %}', ajax_url: '{% url "api-users:user-list" %}',
columns: [{data: "id"}, {data: "username" }, {data: "name" }, {data: "get_role_display" }, columns: [{data: "id"}, {data: "username" }, {data: "name" }, {data: "get_role_display" },
{data: "groups_display" }, {data: "is_valid" }, {data: "id" }] {data: "groups_display" }, {data: "is_valid" }, {data: "id" }]
}; };
@ -107,7 +107,7 @@ $(document).ready(function(){
if (id_list === []) { if (id_list === []) {
return false; return false;
} }
var the_url = "{% url 'users:api-user-list' %}"; var the_url = "{% url 'api-users:user-list' %}";
function doDeactive() { function doDeactive() {
var body = $.each(id_list, function(index, user_object) { var body = $.each(id_list, function(index, user_object) {
user_object['is_active'] = false; user_object['is_active'] = false;
@ -160,7 +160,7 @@ $(document).ready(function(){
var $this = $(this); var $this = $(this);
function doDelete() { function doDelete() {
var uid = $this.data('uid'); var uid = $this.data('uid');
var the_url = '{% url "users:api-user-detail" pk=99991937 %}'.replace('99991937', uid); var the_url = '{% url "api-users:user-detail" pk=99991937 %}'.replace('99991937', uid);
var body = {}; var body = {};
var success = function() { var success = function() {
var msg = "{% trans 'User Deleted.' %}"; var msg = "{% trans 'User Deleted.' %}";
@ -215,7 +215,7 @@ $(document).ready(function(){
if (post_list === []) { if (post_list === []) {
return false return false
} }
var the_url = "{% url 'users:api-user-list' %}"; var the_url = "{% url 'api-users:user-list' %}";
var success = function() { var success = function() {
var msg = "{% trans 'The selected users has been updated successfully.' %}"; var msg = "{% trans 'The selected users has been updated successfully.' %}";
swal("{% trans 'User Updated' %}", msg, "success"); swal("{% trans 'User Updated' %}", msg, "success");

16
apps/users/urls.py
View File

@ -44,25 +44,25 @@ urlpatterns = [
router = BulkRouter() router = BulkRouter()
router.register(r'v1/users', api.UserViewSet, 'api-user') router.register(r'v1/users', api.UserViewSet, 'user')
router.register(r'v1/user-groups', api.UserGroupViewSet, 'api-user-group') router.register(r'v1/user-groups', api.UserGroupViewSet, 'user-group')
# router.register(r'v1/user-groups', api.AssetViewSet, 'api-groups') # router.register(r'v1/user-groups', api.AssetViewSet, 'api-groups')
urlpatterns += [ urlpatterns += [
# url(r'^v1/users/$', api.UserListUpdateApi.as_view(), name='user-bulk-update-api'), # url(r'^v1/users/$', api.UserListUpdateApi.as_view(), name='user-bulk-update-api'),
url(r'^v1/users/token/$', api.UserAuthApi.as_view(), name='api-user-token'), url(r'^v1/users/token/$', api.UserAuthApi.as_view(), name='user-token'),
url(r'^v1/users/(?P<pk>\d+)/reset-password/$', api.UserResetPasswordApi.as_view(), name='api-user-reset-password'), url(r'^v1/users/(?P<pk>\d+)/reset-password/$', api.UserResetPasswordApi.as_view(), name='user-reset-password'),
url(r'^v1/users/(?P<pk>\d+)/reset-pk/$', api.UserResetPKApi.as_view(), name='api-user-reset-pk'), url(r'^v1/users/(?P<pk>\d+)/reset-pk/$', api.UserResetPKApi.as_view(), name='user-reset-pk'),
url(r'^v1/users/(?P<pk>\d+)/update-pk/$', api.UserUpdatePKApi.as_view(), name='api-user-update-pk'), url(r'^v1/users/(?P<pk>\d+)/update-pk/$', api.UserUpdatePKApi.as_view(), name='user-update-pk'),
# url(r'^v1/user-groups/$', api.GroupListUpdateApi.as_view(), name='user-group-bulk-update-api'), # url(r'^v1/user-groups/$', api.GroupListUpdateApi.as_view(), name='user-group-bulk-update-api'),
# url(r'^v1/user-groups/(?P<pk>\d+)/$', api.GroupDetailApi.as_view(), name='user-group-detail-api'), # url(r'^v1/user-groups/(?P<pk>\d+)/$', api.GroupDetailApi.as_view(), name='user-group-detail-api'),
# url(r'^v1/user-groups/(?P<pk>\d+)/user/(?P<uid>\d+)/$', # url(r'^v1/user-groups/(?P<pk>\d+)/user/(?P<uid>\d+)/$',
# api.DeleteUserFromGroupApi.as_view(), name='delete-user-from-group-api'), # api.DeleteUserFromGroupApi.as_view(), name='delete-user-from-group-api'),
url(r'^v1/users/(?P<pk>\d+)/groups/$', url(r'^v1/users/(?P<pk>\d+)/groups/$',
api.UserUpdateGroupApi.as_view(), name='api-user-update-group'), api.UserUpdateGroupApi.as_view(), name='user-update-group'),
url(r'^v1/user-groups/(?P<pk>\d+)/users/$', url(r'^v1/user-groups/(?P<pk>\d+)/users/$',
api.UserGroupUpdateUserApi.as_view(), name='api-user-group-update-user'), api.UserGroupUpdateUserApi.as_view(), name='user-group-update-user'),
] ]
urlpatterns += router.urls urlpatterns += router.urls