diff --git a/apps/assets/templates/assets/admin_user_assets.html b/apps/assets/templates/assets/admin_user_assets.html index cf086379b..b1698c976 100644 --- a/apps/assets/templates/assets/admin_user_assets.html +++ b/apps/assets/templates/assets/admin_user_assets.html @@ -156,8 +156,8 @@ function initTable() { order: [], columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, {targets: 5, createdCell: function (td, cellData) { if (!cellData) { @@ -224,7 +224,7 @@ $(document).ready(function () { var $this = $(this); var name = "{{ admin_user.name }}"; var uid = "{{ admin_user.id }}"; - var the_url = '{% url "api-assets:admin-user-detail" pk=99991937 %}'.replace('99991937', uid); + var the_url = '{% url "api-assets:admin-user-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid); var redirect_url = "{% url 'assets:admin-user-list' %}"; objectDelete($this, name, the_url, redirect_url); }) diff --git a/apps/assets/templates/assets/admin_user_detail.html b/apps/assets/templates/assets/admin_user_detail.html index e7f72b47a..d4aaae23d 100644 --- a/apps/assets/templates/assets/admin_user_detail.html +++ b/apps/assets/templates/assets/admin_user_detail.html @@ -197,7 +197,7 @@ $(document).ready(function () { var $this = $(this); var name = "{{ admin_user.name }}"; var uid = "{{ admin_user.id }}"; - var the_url = '{% url "api-assets:admin-user-detail" pk=99991937 %}'.replace('99991937', uid); + var the_url = '{% url "api-assets:admin-user-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid); var redirect_url = "{% url 'assets:admin-user-list' %}"; objectDelete($this, name, the_url, redirect_url); }) diff --git a/apps/assets/templates/assets/admin_user_list.html b/apps/assets/templates/assets/admin_user_list.html index 0db237b46..cc7cfc8cf 100644 --- a/apps/assets/templates/assets/admin_user_list.html +++ b/apps/assets/templates/assets/admin_user_list.html @@ -39,13 +39,13 @@ $(document).ready(function(){ ele: $('#admin_user_list_table'), columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, {targets: 6, createdCell: function (td, cellData, rowData) { -{# var script_btn = '{% trans "Script" %}'.replace('99991937', cellData);#} - var update_btn = '{% trans "Update" %}'.replace('99991937', cellData); - var del_btn = '{% trans "Delete" %}'.replace('99991937', cellData); +{# var script_btn = '{% trans "Script" %}'.replace('{{ DEFAULT_PK }}', cellData);#} + var update_btn = '{% trans "Update" %}'.replace('{{ DEFAULT_PK }}', cellData); + var del_btn = '{% trans "Delete" %}'.replace('{{ DEFAULT_PK }}', cellData); {# $(td).html(script_btn + update_btn + del_btn)#} $(td).html(update_btn + del_btn) }}], @@ -61,7 +61,7 @@ $(document).ready(function(){ var $data_table = $("#admin_user_list_table").DataTable(); var name = $(this).closest("tr").find(":nth-child(2)").children('a').html(); var uid = $this.data('uid'); - var the_url = '{% url "api-assets:admin-user-detail" pk=99991937 %}'.replace('99991937', uid); + var the_url = '{% url "api-assets:admin-user-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid); objectDelete($this, name, the_url); setTimeout( function () { $data_table.ajax.reload(); diff --git a/apps/assets/templates/assets/asset_detail.html b/apps/assets/templates/assets/asset_detail.html index 78b21023b..7e5df44b6 100644 --- a/apps/assets/templates/assets/asset_detail.html +++ b/apps/assets/templates/assets/asset_detail.html @@ -350,7 +350,7 @@ $(document).ready(function () { var $this = $(this); var name = "{{ asset.hostname }}"; var uid = "{{ asset.id }}"; - var the_url = '{% url "api-assets:asset-detail" pk=99991937 %}'.replace('99991937', uid); + var the_url = '{% url "api-assets:asset-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid); var redirect_url = "{% url 'assets:asset-list' %}"; objectDelete($this, name, the_url, redirect_url); }).on('click', '#btn_refresh_asset', function () { diff --git a/apps/assets/templates/assets/asset_group_detail.html b/apps/assets/templates/assets/asset_group_detail.html index a21f5a744..9fad51a58 100644 --- a/apps/assets/templates/assets/asset_group_detail.html +++ b/apps/assets/templates/assets/asset_group_detail.html @@ -176,8 +176,8 @@ function initTable() { order: [], columnDefs: [ {targets: 0, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, {targets: 4, createdCell: function (td, cellData) { if (!cellData) { @@ -187,8 +187,8 @@ function initTable() { } }}, {targets: 5, createdCell: function (td, cellData, rowData) { - var update_btn = '{% trans "Update" %}'.replace('99991937', rowData.id); - var del_btn = '{% trans "Remove" %}'.replace('99991937', rowData.id); + var update_btn = '{% trans "Update" %}'.replace('{{ DEFAULT_PK }}', rowData.id); + var del_btn = '{% trans "Remove" %}'.replace('{{ DEFAULT_PK }}', rowData.id); $(td).html(update_btn + del_btn) }} ], diff --git a/apps/assets/templates/assets/asset_group_list.html b/apps/assets/templates/assets/asset_group_list.html index 6828aa9e0..3eea40608 100644 --- a/apps/assets/templates/assets/asset_group_list.html +++ b/apps/assets/templates/assets/asset_group_list.html @@ -44,16 +44,16 @@ $(document).ready(function(){ ele: $('#asset_groups_list_table'), columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, {targets: 3, createdCell: function (td, cellData) { var innerHtml = cellData.length > 30 ? cellData.substring(0, 30) + '...': cellData; $(td).html('' + innerHtml + ''); }}, {targets: 4, createdCell: function (td, cellData, rowData) { - var update_btn = '{% trans "Update" %}'.replace('99991937', cellData); - var del_btn = '{% trans "Delete" %}'.replace('99991937', cellData); + var update_btn = '{% trans "Update" %}'.replace('{{ DEFAULT_PK }}', cellData); + var del_btn = '{% trans "Delete" %}'.replace('{{ DEFAULT_PK }}', cellData); $(td).html(update_btn + del_btn) }}], ajax_url: '{% url "api-assets:asset-group-list" %}', @@ -68,7 +68,7 @@ $(document).ready(function(){ var $data_table = $('#asset_groups_list_table').DataTable(); var name = $(this).closest("tr").find(":nth-child(2)").children('a').html(); var uid = $this.data('uid'); - var the_url = '{% url "api-assets:asset-group-detail" pk=99991937 %}'.replace('99991937', uid); + var the_url = '{% url "api-assets:asset-group-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid); objectDelete($this, name, the_url); setTimeout( function () { $data_table.ajax.reload(); diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html index f1c8d2061..d1475906d 100644 --- a/apps/assets/templates/assets/asset_list.html +++ b/apps/assets/templates/assets/asset_list.html @@ -93,7 +93,7 @@ $(document).ready(function(){ }}, {targets: 9, createdCell: function (td, cellData, rowData) { var update_btn = '{% trans "Update" %}'.replace("{{ DEFAULT_PK }}", cellData); - var del_btn = '{% trans "Delete" %}'.replace('99991937', cellData); + var del_btn = '{% trans "Delete" %}'.replace('{{ DEFAULT_PK }}', cellData); $(td).html(update_btn + del_btn) }} ], @@ -151,7 +151,7 @@ $(document).ready(function(){ var $data_table = $("#asset_list_table").DataTable(); var name = $(this).closest("tr").find(":nth-child(2)").children('a').html(); var uid = $this.data('uid'); - var the_url = '{% url "api-assets:asset-detail" pk=99991937 %}'.replace("{{ DEFAULT_PK }}", uid); + var the_url = '{% url "api-assets:asset-detail" pk=DEFAULT_PK %}'.replace("{{ DEFAULT_PK }}", uid); objectDelete($this, name, the_url); setTimeout( function () { $data_table.ajax.reload(); diff --git a/apps/assets/templates/assets/cluster_assets.html b/apps/assets/templates/assets/cluster_assets.html index d0a6a03f8..71d2b322d 100644 --- a/apps/assets/templates/assets/cluster_assets.html +++ b/apps/assets/templates/assets/cluster_assets.html @@ -158,8 +158,8 @@ function initTable() { order: [], columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, {targets: 5, createdCell: function (td, cellData) { if (!cellData) { diff --git a/apps/assets/templates/assets/cluster_detail.html b/apps/assets/templates/assets/cluster_detail.html index 41526c533..19ab7c927 100644 --- a/apps/assets/templates/assets/cluster_detail.html +++ b/apps/assets/templates/assets/cluster_detail.html @@ -149,7 +149,7 @@ $(document).ready(function () { .on('click', '.btn-delete-cluster', function () { var name = $('.cluster-details > tbody > tr').attr("data-name"); var id = {{ cluster.id }}; - var the_url = '{% url "api-assets:cluster-detail" pk=99991937 %}'.replace(99991937, id); + var the_url = '{% url "api-assets:cluster-detail" pk=DEFAULT_PK %}'.replace("{{ DEFAULT_PK }}", id); clusterDelete(name, the_url); }); diff --git a/apps/assets/templates/assets/cluster_list.html b/apps/assets/templates/assets/cluster_list.html index 70579b774..0ba0631c2 100644 --- a/apps/assets/templates/assets/cluster_list.html +++ b/apps/assets/templates/assets/cluster_list.html @@ -48,13 +48,13 @@ $(document).ready(function(){ ele: $('#cluster_list_table'), columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, {targets: 7, createdCell: function (td, cellData, rowData) { - var update_btn = '{% trans "Update" %}'.replace('99991937', cellData); - var del_btn = '{% trans "Delete" %}'.replace('99991937', cellData); + var update_btn = '{% trans "Update" %}'.replace('{{ DEFAULT_PK }}', cellData); + var del_btn = '{% trans "Delete" %}'.replace('{{ DEFAULT_PK }}', cellData); $(td).html(update_btn + del_btn) }}], ajax_url: '{% url "api-assets:cluster-list" %}', @@ -70,7 +70,7 @@ $(document).ready(function(){ var $data_table = $('#cluster_list_table').DataTable(); var name = $(this).closest("tr").find(":nth-child(2)").children('a').html(); var uid = $this.data('uid'); - var the_url = '{% url "api-assets:cluster-detail" pk=99991937 %}'.replace('99991937', uid); + var the_url = '{% url "api-assets:cluster-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid); objectDelete($this, name, the_url); setTimeout( function () { $data_table.ajax.reload(); diff --git a/apps/assets/templates/assets/system_user_asset.html b/apps/assets/templates/assets/system_user_asset.html index 0314bdd84..6a9261a22 100644 --- a/apps/assets/templates/assets/system_user_asset.html +++ b/apps/assets/templates/assets/system_user_asset.html @@ -119,8 +119,8 @@ function initAssetsTable() { order: [], columnDefs: [ {targets: 0, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, {targets: 3, createdCell: function (td, cellData) { if (!cellData) { diff --git a/apps/assets/templates/assets/system_user_list.html b/apps/assets/templates/assets/system_user_list.html index b9baa6205..6aa32a622 100644 --- a/apps/assets/templates/assets/system_user_list.html +++ b/apps/assets/templates/assets/system_user_list.html @@ -46,17 +46,17 @@ $(document).ready(function(){ ele: $('#system_user_list_table'), columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, {targets: 5, createdCell: function (td, cellData) { var innerHtml = cellData.length > 30 ? cellData.substring(0, 30) + '...': cellData; $(td).html('' + innerHtml + ''); }}, {targets: 6, createdCell: function (td, cellData, rowData) { -{# var script_btn = '{% trans "Script" %}'.replace('99991937', cellData);#} - var update_btn = '{% trans "Update" %}'.replace('99991937', cellData); - var del_btn = '{% trans "Delete" %}'.replace('99991937', cellData); +{# var script_btn = '{% trans "Script" %}'.replace('{{ DEFAULT_PK }}', cellData);#} + var update_btn = '{% trans "Update" %}'.replace('{{ DEFAULT_PK }}', cellData); + var del_btn = '{% trans "Delete" %}'.replace('{{ DEFAULT_PK }}', cellData); $(td).html(update_btn + del_btn) }}], ajax_url: '{% url "api-assets:system-user-list" %}', @@ -72,7 +72,7 @@ $(document).ready(function(){ var $data_table = $('#cluster_list_table').DataTable(); var name = $(this).closest("tr").find(":nth-child(2)").children('a').html(); var uid = $this.data('uid'); - var the_url = '{% url "api-assets:system-user-detail" pk=99991937 %}'.replace('99991937', uid); + var the_url = '{% url "api-assets:system-user-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid); objectDelete($this, name, the_url); setTimeout( function () { $data_table.ajax.reload(); diff --git a/apps/assets/templates/assets/user_asset_list.html b/apps/assets/templates/assets/user_asset_list.html index 27657564b..0b137a961 100644 --- a/apps/assets/templates/assets/user_asset_list.html +++ b/apps/assets/templates/assets/user_asset_list.html @@ -53,8 +53,8 @@ $(document).ready(function(){ ele: $('#asset_list_table'), columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, {targets: 7, createdCell: function (td, cellData) { if (!cellData) { @@ -122,7 +122,7 @@ $(document).ready(function(){ var $this = $(this); var name = $(this).closest("tr").find(":nth-child(2)").children('a').html(); var uid = $this.data('uid'); - var the_url = '{% url "api-assets:asset-detail" pk=99991937 %}'.replace('99991937', uid); + var the_url = '{% url "api-assets:asset-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid); objectDelete($this, name, the_url); }) diff --git a/apps/ops/templates/ops/task_adhoc.html b/apps/ops/templates/ops/task_adhoc.html index 8eb47c8fd..41d30b068 100644 --- a/apps/ops/templates/ops/task_adhoc.html +++ b/apps/ops/templates/ops/task_adhoc.html @@ -106,7 +106,7 @@ } }}, {targets: 7, createdCell: function (td, cellData, rowData) { - var detail_btn = '{% trans "Detail" %}'.replace('99991937', cellData); + var detail_btn = '{% trans "Detail" %}'.replace('{{ DEFAULT_PK }}', cellData); if (cellData) { $(td).html(detail_btn); } diff --git a/apps/ops/templates/ops/task_history.html b/apps/ops/templates/ops/task_history.html index 772455429..dbd673100 100644 --- a/apps/ops/templates/ops/task_history.html +++ b/apps/ops/templates/ops/task_history.html @@ -115,7 +115,7 @@ } }}, {targets: 7, createdCell: function (td, cellData) { - var run_btn = '{% trans "Detail" %}'.replace('99991937', cellData); + var run_btn = '{% trans "Detail" %}'.replace('{{ DEFAULT_PK }}', cellData); if (cellData) { $(td).html(run_btn); } diff --git a/apps/ops/templates/ops/task_list.html b/apps/ops/templates/ops/task_list.html index 765525318..7b1c2cde3 100644 --- a/apps/ops/templates/ops/task_list.html +++ b/apps/ops/templates/ops/task_list.html @@ -96,7 +96,7 @@ var $this = $(this); var name = $(this).closest("tr").find(":nth-child(2)").children('a').html(); var uid = $this.data('uid'); - var the_url = '{% url "api-ops:task-detail" pk=99991937 %}'.replace('99991937', uid); + var the_url = '{% url "api-ops:task-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid); objectDelete($this, name, the_url); }) diff --git a/apps/perms/templates/perms/asset_permission_detail.html b/apps/perms/templates/perms/asset_permission_detail.html index c7d47b3ca..c69909467 100644 --- a/apps/perms/templates/perms/asset_permission_detail.html +++ b/apps/perms/templates/perms/asset_permission_detail.html @@ -239,7 +239,7 @@ var $this = $(this); var name = "{{ asset_permission.name }}"; var uid = "{{ asset_permission.id }}"; - var the_url = '{% url "api-perms:asset-permission-detail" pk=99991937 %}'.replace('99991937', uid); + var the_url = '{% url "api-perms:asset-permission-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid); var redirect_url = "{% url 'perms:asset-permission-list' %}"; objectDelete($this, name, the_url, redirect_url); }).on('click', '#btn_add_system_user', function () { diff --git a/apps/perms/templates/perms/asset_permission_list.html b/apps/perms/templates/perms/asset_permission_list.html index 07ccf75cf..ab76dee88 100644 --- a/apps/perms/templates/perms/asset_permission_list.html +++ b/apps/perms/templates/perms/asset_permission_list.html @@ -61,8 +61,8 @@ var $this = $(this); var name = $this.data('name'); var uid = $this.data('uid'); - var the_url = '{% url "api-perms:asset-permission-detail" pk=99991937 %}' - .replace('99991937', uid); + var the_url = '{% url "api-perms:asset-permission-detail" pk=DEFAULT_PK %}' + .replace('{{ DEFAULT_PK }}', uid); objectDelete($this, name, the_url); }) diff --git a/apps/terminal/templates/terminal/terminal_list.html b/apps/terminal/templates/terminal/terminal_list.html index 9d427a775..edcfd7f31 100644 --- a/apps/terminal/templates/terminal/terminal_list.html +++ b/apps/terminal/templates/terminal/terminal_list.html @@ -51,8 +51,8 @@ $(document).ready(function(){ buttons: [], columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, {targets: 6, createdCell: function (td, cellData) { if (!cellData) { @@ -69,18 +69,18 @@ $(document).ready(function(){ } }}, {targets: 8, createdCell: function (td, cellData, rowData) { - var update_btn = '{% trans "Update" %}' - .replace('99991937', cellData); - var delete_btn = '{% trans "Delete" %}' - .replace('99991937', cellData) + var update_btn = '{% trans "Update" %}' + .replace('{{ DEFAULT_PK }}', cellData); + var delete_btn = '{% trans "Delete" %}' + .replace('{{ DEFAULT_PK }}', cellData) .replace('99991938', rowData.name); - var accept_btn = '{% trans "Accept" %} ' - .replace('99991937', cellData); - var reject_btn = '{% trans "Reject" %}' - .replace('99991937', cellData) + var accept_btn = '{% trans "Accept" %} ' + .replace('{{ DEFAULT_PK }}', cellData); + var reject_btn = '{% trans "Reject" %}' + .replace('{{ DEFAULT_PK }}', cellData) .replace('99991938', rowData.name); var connect_btn = '{% trans "Connect" %} ' - .replace('99991937', cellData); + .replace('{{ DEFAULT_PK }}', cellData); if (rowData.is_accepted) { {% if user.is_superuser %} $(td).html(connect_btn + update_btn + delete_btn); @@ -117,14 +117,14 @@ $(document).ready(function(){ var $this = $(this); var id = $this.data('id'); var name = $(this).data('name'); - var the_url = '{% url "api-terminal:terminal-detail" pk=99991937 %}'.replace('99991937', id); + var the_url = '{% url "api-terminal:terminal-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', id); objectDelete($this, name, the_url) }).on('click', '.btn-accept', function () { var $this = $(this); var terminal_id = $this.data('id'); - var the_url = "{% url 'api-terminal:terminal-detail' pk=99991937 %}".replace('99991937', terminal_id); - var post_url = $('#form_terminal_accept').attr('action').replace('99991937', terminal_id); + var the_url = "{% url 'api-terminal:terminal-detail' pk=DEFAULT_PK %}".replace('{{ DEFAULT_PK }}', terminal_id); + var post_url = $('#form_terminal_accept').attr('action').replace('{{ DEFAULT_PK }}', terminal_id); console.log(post_url); $.ajax({ url: the_url, diff --git a/apps/terminal/templates/terminal/terminal_modal_accept.html b/apps/terminal/templates/terminal/terminal_modal_accept.html index 58a103402..c9f969458 100644 --- a/apps/terminal/templates/terminal/terminal_modal_accept.html +++ b/apps/terminal/templates/terminal/terminal_modal_accept.html @@ -5,7 +5,7 @@ {% block modal_title%}{% trans "Accept terminal registration" %}{% endblock %} {% block modal_body %} {% load bootstrap3 %} -
+ {% csrf_token %} {% bootstrap_field form.name layout="horizontal" %} diff --git a/apps/users/templates/users/user_asset_permission.html b/apps/users/templates/users/user_asset_permission.html index d70d259c3..405a5f9c1 100644 --- a/apps/users/templates/users/user_asset_permission.html +++ b/apps/users/templates/users/user_asset_permission.html @@ -123,8 +123,8 @@ select: [], columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, {targets: 2, createdCell: function (td, cellData, rowData) { var dataLength = cellData.length; @@ -146,11 +146,11 @@ } }}, {targets: 6, createdCell: function (td, cellData, rowData) { - var btn = ''; + var btn = ''; if (rowData.is_inherited) { $(td).html(btn) } else { - btn = btn.replace('99991937', cellData); + btn = btn.replace('{{ DEFAULT_PK }}', cellData); $(td).html(btn.replace('disabled', '')); } }} diff --git a/apps/users/templates/users/user_detail.html b/apps/users/templates/users/user_detail.html index 19ca54c0e..dea2a82ce 100644 --- a/apps/users/templates/users/user_detail.html +++ b/apps/users/templates/users/user_detail.html @@ -398,7 +398,7 @@ $(document).ready(function() { var $this = $(this); var name = "{{ user.name }}"; var uid = "{{ user.id }}"; - var the_url = '{% url "api-users:user-detail" pk=99991937 %}'.replace('99991937', uid); + var the_url = '{% url "api-users:user-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid); var redirect_url = "{% url 'users:user-list' %}"; objectDelete($this, name, the_url, redirect_url); }) diff --git a/apps/users/templates/users/user_granted_asset.html b/apps/users/templates/users/user_granted_asset.html index cda62e2e6..db8ca0800 100644 --- a/apps/users/templates/users/user_granted_asset.html +++ b/apps/users/templates/users/user_granted_asset.html @@ -113,8 +113,8 @@ select: [], columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, {targets: 4, createdCell: function (td, cellData, rowData) { if (cellData.length > 10){ @@ -142,8 +142,8 @@ select: [], columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }} ], ajax_url: '{% url "api-perms:user-asset-groups" pk=user.id %}', diff --git a/apps/users/templates/users/user_group_asset_permission.html b/apps/users/templates/users/user_group_asset_permission.html index cd6db7f46..a775b8518 100644 --- a/apps/users/templates/users/user_group_asset_permission.html +++ b/apps/users/templates/users/user_group_asset_permission.html @@ -124,8 +124,8 @@ select: [], columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, {targets: 2, createdCell: function (td, cellData, rowData) { var dataLength = cellData.length; @@ -147,8 +147,8 @@ } }}, {targets: 6, createdCell: function (td, cellData, rowData) { - var btn = ''; - btn = btn.replace('99991937', cellData); + var btn = ''; + btn = btn.replace('{{ DEFAULT_PK }}', cellData); $(td).html(btn) }} ], diff --git a/apps/users/templates/users/user_group_detail.html b/apps/users/templates/users/user_group_detail.html index b17f19e5a..8bc04ca23 100644 --- a/apps/users/templates/users/user_group_detail.html +++ b/apps/users/templates/users/user_group_detail.html @@ -193,7 +193,7 @@ $(document).ready(function () { var $this = $(this); var name = "{{ user_group.name }}"; var uid = "{{ user_group.id }}"; - var the_url = '{% url "api-users:user-group-detail" pk=99991937 %}'.replace('99991937', uid); + var the_url = '{% url "api-users:user-group-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid); var redirect_url = "{% url 'users:user-group-list' %}"; objectDelete($this, name, the_url, redirect_url); }) diff --git a/apps/users/templates/users/user_group_granted_asset.html b/apps/users/templates/users/user_group_granted_asset.html index ce3a37121..5749ac1f5 100644 --- a/apps/users/templates/users/user_group_granted_asset.html +++ b/apps/users/templates/users/user_group_granted_asset.html @@ -113,8 +113,8 @@ select: [], columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, {targets: 4, createdCell: function (td, cellData, rowData) { if (cellData.length > 10){ @@ -142,8 +142,8 @@ select: [], columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }} ], ajax_url: '{% url "api-perms:user-group-asset-groups" pk=user_group.id %}', diff --git a/apps/users/templates/users/user_group_list.html b/apps/users/templates/users/user_group_list.html index 849010ad3..88a6d020a 100644 --- a/apps/users/templates/users/user_group_list.html +++ b/apps/users/templates/users/user_group_list.html @@ -39,18 +39,18 @@ $(document).ready(function() { buttons: [], columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('99991937', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, {targets: 3, createdCell: function (td, cellData) { var innerHtml = cellData.length > 30 ? cellData.substring(0, 30) + '...': cellData; $(td).html('' + innerHtml + ''); }}, {targets: 4, createdCell: function (td, cellData, rowData) { - var update_btn = '{% trans "Update" %}' - .replace('99991937', cellData); - var del_btn = '{% trans "Delete" %}' - .replace('99991937', cellData) + var update_btn = '{% trans "Update" %}' + .replace('{{ DEFAULT_PK }}', cellData); + var del_btn = '{% trans "Delete" %}' + .replace('{{ DEFAULT_PK }}', cellData) .replace('99991938', rowData.name); if (rowData.id === 1) { $(td).html(update_btn) @@ -69,7 +69,7 @@ $(document).ready(function() { var $this = $(this); var group_id = $this.data('gid'); var name = $this.data('name'); - var the_url = "{% url 'api-users:user-group-detail' pk=99991937 %}".replace('99991937', group_id); + var the_url = "{% url 'api-users:user-group-detail' pk=DEFAULT_PK %}".replace('{{ DEFAULT_PK }}', group_id); objectDelete($this, name, the_url) }).on('click', '#btn_bulk_update', function(){ var action = $('#slct_bulk_update').val(); diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html index 7f0bda0e5..cd6e8e69e 100644 --- a/apps/users/templates/users/user_list.html +++ b/apps/users/templates/users/user_list.html @@ -74,8 +74,8 @@ function renderTable() { ele: $('#user_list_table'), columnDefs: [ {targets: 1, createdCell: function (td, cellData, rowData) { - var detail_btn = '' + cellData + ''; - $(td).html(detail_btn.replace('00000000-0000-0000-0000-000000000000', rowData.id)); + var detail_btn = '' + cellData + ''; + $(td).html(detail_btn.replace("{{ DEFAULT_PK }}", rowData.id)); }}, {targets: 4, createdCell: function (td, cellData) { var innerHtml = cellData.length > 20 ? cellData.substring(0, 20) + '...': cellData; @@ -90,8 +90,8 @@ function renderTable() { }}, {targets: 6, createdCell: function (td, cellData, rowData) { var update_btn = '{% trans "Update" %}'.replace('00000000-0000-0000-0000-000000000000', cellData); - var del_btn = '{% trans "Delete" %}' - .replace('00000000-0000-0000-0000-000000000000', cellData) + var del_btn = '{% trans "Delete" %}' + .replace('{{ DEFAULT_PK }}', cellData) .replace('99991938', rowData.name); if (rowData.id === 1 || rowData.username == "admin") { $(td).html(update_btn)