Skip to content

Commit

Permalink
delivery perms display
Browse files Browse the repository at this point in the history
  • Loading branch information
@guohongze
guohongze committed Feb 12, 2019
1 parent 3499760 commit f88e6e4
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions delivery/urls.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
url(r'^deliedit/(?P<project_id>\d+)/$', deli.delivery_edit, name='delivery_edit'),
url(r'^delilog/(?P<project_id>\d+)/$', deli.log, name='delivery_log'),
url(r'^delilog2/(?P<project_id>\d+)/$', deli.log2, name='delivery_log2'),
url(r'^delilogdelete/$', deli.log_del, name='log_del'),
url(r'^delilogdel/$', deli.log_del, name='log_del'),
url(r'^delilogdelall/$', deli.log_delall, name='log_delall'),
url(r'^delilogshistory/(?P<project_id>\d+)/$', deli.logs_history, name='logs_history'),
url(r'^deligetlogs/(?P<project_id>\d+)/(?P<logname>.+)/$', deli.get_log, name='get_log'),
url(r'^delideploy/(?P<project_id>\d+)/$', deli.delivery_deploy, name='delivery_deploy'),
url(r'^delitaskstop/(?P<project_id>\d+)/$', deli.task_stop, name='delivery_taskstop'),
url(r'^delidelete/$', deli.delivery_del, name='delivery_del'),
url(r'^delidel/$', deli.delivery_del, name='delivery_del'),
]
6 changes: 3 additions & 3 deletions templates/delivery/delivery_base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
function init() {
var box = document.getElementById("delivery");
box.className="active";
var box2 = document.getElementById("delivery_list");
box2.className="active";
}
</script>

Expand Down Expand Up @@ -42,7 +40,9 @@
{{ field.errors }}
{% if field.html_name == "auth" %}
{{ field.label_tag }} {{ field }}
<a href="#" onclick="return popWin()"><li class="btn btn-success" ><b>添加认证</b></li></a>
<div class="btn btn-group">
<a id="authinfoaddmini" style="display: none;" href="#" onclick="return popWin()"><li class="btn btn-success" ><b>添加认证</b></li></a>
</div>
{% else %}
{{ field.label_tag }} {{ field }}
{% endif %}
Expand Down
22 changes: 11 additions & 11 deletions templates/delivery/delivery_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
function init() {
var box = document.getElementById("delivery");
box.className="active";
var box2 = document.getElementById("delivery_list");
var box2 = document.getElementById("delivery");
box2.className="active";
}
</script>
Expand All @@ -38,8 +38,8 @@
{% csrf_token %}
<div class="box">
<div class="box-header">
<div class="col-sm-2" style="padding-left: 0">
<a href="{% url 'delivery_add' %}"><li class="btn btn-success" ><b>添加项目</b></li></a>
<div class="btn btn-group" style="padding-left: 0">
<a id="deliadd" style="display: none;" href="{% url 'delivery_add' %}"><li class="btn btn-success" ><b>添加项目</b></li></a>
</div>
</div>
<div class="col-md-5">
Expand Down Expand Up @@ -112,12 +112,12 @@
</td>
<td>{{ project.deploy_policy }} </td>
<td>
<a href="#"><li onclick="return deploy(this.value);" class="btn btn-sm btn-default" value="{{ project.job_name_id }}">部署</li></a>
<a href="#"><li style="list-style-type:none" class="btn btn-sm btn-default" onclick="return tanchu(this.value)" value="{{ project.job_name_id }}">日志</li></a>
<a href="#"><li style="list-style-type:none" class="btn btn-sm btn-default" onclick="return logs_history(this.value)" value="{{ project.job_name_id }}">历史</li></a>
<a href="#"><li onclick="return tanchu_edit(this.value) " value="{{ project.job_name_id }}" class="btn btn-sm btn-default">编辑</li></a>
<a href="#"><li onclick="return taskstop(this.value);" class="btn btn-sm btn-default" value="{{ project.job_name_id }}">清理</li></a>
<a href="{% url "delivery_del"%}?project_id={{ project.id }}" onclick="return confirm('确认删除项目吗？')"><span class="btn btn-sm btn-danger ">删除</span></a>
<a id="delideploy" style="display: none; float: left; margin: auto;" href="#"><li onclick="return deploy(this.value);" class="btn btn-sm btn-default" value="{{ project.job_name_id }}">部署</li></a>
<a id="delilog" style="display: none; float: left; margin: auto;" href="#"><li style="list-style-type:none" class="btn btn-sm btn-default" onclick="return tanchu(this.value)" value="{{ project.job_name_id }}">日志</li></a>
<a id="delilogshistory" style="display: none; float: left; margin: auto;" href="#"><li style="list-style-type:none" class="btn btn-sm btn-default" onclick="return logs_history(this.value)" value="{{ project.job_name_id }}">历史</li></a>
<a id="deliedit" style="display: none; float: left; margin: auto;" href="#"><li onclick="return tanchu_edit(this.value) " value="{{ project.job_name_id }}" class="btn btn-sm btn-default">编辑</li></a>
<a id="delitaskstop" style="display: none; float: left; margin: auto;" href="#"><li onclick="return taskstop(this.value);" class="btn btn-sm btn-default" value="{{ project.job_name_id }}">清理</li></a>
<a id="delidel" style="display: none; float: left; margin: auto;" href="{% url "delivery_del"%}?project_id={{ project.id }}" onclick="return confirm('确认删除项目吗？')"><span class="btn btn-sm btn-danger ">删除</span></a>
</td>
</tr>
{% endfor %}
Expand All @@ -127,7 +127,7 @@
{% include 'paginator.html' %}
</div>
<div class="btn-group">
<input type="button" id="project_del" class="btn btn-danger" name="del_button" value="删除项目"/>
{# <input type="button" id="project_del" class="btn btn-danger" name="del_button" value="删除项目"/>#}
</div>
</div>
</div>
Expand All @@ -144,7 +144,7 @@
"searching": true,
"ordering": true,
"info": false,
"autoWidth": true
"bAutoWidth": false
});
});
</script>
Expand Down
4 changes: 2 additions & 2 deletions templates/delivery/logs_history.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
{% for log in logs_history %}
<tr class="even gradeX">
<td><a href="/delivery/deligetlogs/{{ project_id }}/{{ log }}/">{{ log }}</a></td>
<td><a href="{% url "log_del" %}?project_id={{ project.id }}&logname={{ log }}" onclick="return confirm('确认删除项目吗？')"><span class="btn btn-sm btn-danger ">删除</span></a></td>
<td><a id="logdel" style="display: none;" href="{% url "log_del" %}?project_id={{ project.id }}&logname={{ log }}" onclick="return confirm('确认删除项目吗？')"><span class="btn btn-sm btn-danger ">删除</span></a></td>
</tr>
{% endfor %}
</tbody>
</table>
<div class="btn-group">
<a href="{% url "log_delall" %}?project_id={{ project_id }}" onclick="return confirm('删除所有？')"><span class="btn btn-sm btn-danger ">删除全部</span></a>
<a id="logdelall" style="logdelall" href="{% url "log_delall" %}?project_id={{ project_id }}" onclick="return confirm('删除所有？')"><span class="btn btn-sm btn-danger ">删除全部</span></a>
</div>
</div>
</div>
Expand Down

0 comments on commit f88e6e4

Please sign in to comment.