diff --git a/apps/ops/templates/ops/command_execution_create.html b/apps/ops/templates/ops/command_execution_create.html index f49ba0c13..a832b7fc9 100644 --- a/apps/ops/templates/ops/command_execution_create.html +++ b/apps/ops/templates/ops/command_execution_create.html @@ -263,7 +263,10 @@ function execute() { var editor; $(document).ready(function(){ systemUserId = $('#system-users-select').val(); - $(".select2").select2().on('select2:select', function(evt) { + $(".select2").select2({ + dropdownAutoWidth : true, + width: 'auto' + }).on('select2:select', function(evt) { var data = evt.params.data; systemUserId = data.id; initTree(); diff --git a/apps/ops/templates/ops/command_execution_list.html b/apps/ops/templates/ops/command_execution_list.html index 10f3c0fe3..4c38aa2d1 100644 --- a/apps/ops/templates/ops/command_execution_list.html +++ b/apps/ops/templates/ops/command_execution_list.html @@ -3,6 +3,18 @@ {% load static %} {% load common_tags %} +{% block custom_head_css_js %} + + + + + +{% endblock %} + {% block content_left_head %} {% endblock %} @@ -39,46 +51,49 @@ {% endblock %} -{% block table_head %} -
+ | {% trans 'Hosts' %} | +{% trans 'User' %} | +{% trans 'Command' %} | +{% trans 'Run as' %} | +{% trans 'Output' %} | +{% trans 'Finished' %} | +{% trans 'Success' %} | +{% trans 'Date start' %} | + + {% for object in object_list %}|||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
- | {{ object.get_hosts_names }} | -{{ object.user }} | +{{ forloop.counter }} | ++ | {{ object.user.name }} | {{ object.command| truncatechars:16 }} | -{{ object.run_as }} | +{{ object.run_as.username }} | 查看 | {{ object.is_finished | state_show | safe }} | {{ object.is_success | state_show | safe }} | {{ object.date_start }} | -{{ object.date_finished }} |