diff --git a/apps/assets/templates/assets/domain_gateway_list.html b/apps/assets/templates/assets/domain_gateway_list.html index 1f25e6ac18460e7b382a57f28265a6e5f0a15516..3dc82652f3cb0af1b00726b5548cee7abb8285a3 100644 --- a/apps/assets/templates/assets/domain_gateway_list.html +++ b/apps/assets/templates/assets/domain_gateway_list.html @@ -95,8 +95,8 @@ function initTable() { ], ajax_url: '{% url "api-assets:gateway-list" %}?domain={{ object.id }}', columns: [ - {data: "id"}, {data: "name" }, {data: 'ip'}, {data: 'port'}, {data: "username" }, - {data: "protocol"}, {data: "comment" }, {data: "id"} + {data: "id"}, {data: "name" }, {data: 'ip'}, {data: 'port'}, + {data: "protocol"}, {data: "username" }, {data: "comment" }, {data: "id"} ], op_html: $('#actions').html() }; diff --git a/apps/assets/templates/assets/domain_list.html b/apps/assets/templates/assets/domain_list.html index 03b671bf31bfb950f521736dfa9642a2f665b648..926c4bbc31ec8f6df9ccda8d85df7301ef49e5a8 100644 --- a/apps/assets/templates/assets/domain_list.html +++ b/apps/assets/templates/assets/domain_list.html @@ -33,7 +33,11 @@ function initTable() { var detail_btn = '' + cellData + ''; $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id)); }}, - + {targets: 3, createdCell: function (td, cellData, rowData) { + var gateway_list_btn = '' + cellData + ''; + gateway_list_btn = gateway_list_btn.replace("{{ DEFAULT_PK }}", rowData.id); + $(td).html(gateway_list_btn); + }}, {targets: 5, createdCell: function (td, cellData, rowData) { var update_btn = '{% trans "Update" %}'.replace('{{ DEFAULT_PK }}', cellData); var del_btn = '{% trans "Delete" %}'.replace('{{ DEFAULT_PK }}', cellData); diff --git a/apps/ops/templates/ops/task_list.html b/apps/ops/templates/ops/task_list.html index bd07486951b60847a2a5127fcfbb24da410b7175..2b65c9e3e2dda377dd0fb14b3f3652ead03c8c59 100644 --- a/apps/ops/templates/ops/task_list.html +++ b/apps/ops/templates/ops/task_list.html @@ -3,7 +3,7 @@ {% load static %} {% block content_left_head %} -
{% trans "Create task" %}
+{#
{% trans "Create task" %}
#} {% endblock %}