github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-24 21:08:30 +00:00
Code Issues Projects Releases Wiki Activity

Asset meta (#3539)

Browse Source 
- 更改了资产表单，影响
  - 资产创建和更新
- 增加了资产平台数据库，影响
  - 平台创建更新和删除
- 更改了资产的platform字段，又一个字符字段，改为一个外键，影响 
  - 资产创建和更新
  - 资产连接 [windows，linux]
  - 测试连接等ansible任务
  - 自动化云导入
- 更改了资产的序列化器，影响
  - 资产创建更新列表
- 统一了树列表基础模板，影响
  - 资产列表页，权限列表页，vault页，资产收集页
- 统一了导入导出组件，影响
  - 资产导入导出
  - 用户导入导出
  - 用户组导入导出
  - 系统用户导入导出
  - 管理用户导入导出
  - vault导出导出
  - 收集用户列表导入导出
- 修改用户更新密码信号，影响
  - 修改用户密码产生的改密日志

- 新增Model instance序列化工具函数，影响
  - 操作日志生成
- 修改api mixin，新增 serializer_classes字段，serializer_classes = {"default": "", "display": "", "list": .., "other_action": ""}, 根据用户请求的方式返回不同的serializer_class，影响

  - 用户的viewset
  - 资产权限的viewset
- 统一系统配置中的tab切换
- 统一没有nav的页面，影响
  - 重置密码
  - 忘记密码
  - 重置中设置密码
  - 独立的message页面
- 修改用户组列表页，不再返还用户组下的用户，仅有数量
- 组织的一些方法变为layzproperty，避免重复计算
- 修改用户组详情页，影响
  - 用户组增加删除用户
This commit is contained in:
老广
2019-12-16 16:53:29 +08:00
committed by GitHub
parent 4ac4b517f4
commit e1919d0a62
96 changed files with 2323 additions and 2314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
apps/templates/flash_message_standalone.html
View File

@@ -1,83 +1,64 @@
{% load i18n %}
{% extends '_base_only_content.html' %}
{% load static %}
<!DOCTYPE html>
<html>
{% load i18n %}
{% block html_title %} {{ title }} {% endblock %}
{% block title %} {{ title }}{% endblock %}
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% block custom_head_css_js %}
<style>
.passwordBox {
max-width: 660px;
}
</style>
{% endblock %}
<title>{{ title }}</title>
{% include '_head_css_js.html' %}
<link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
<script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
<script src="{% static "js/jumpserver.js" %}"></script>
</head>
<body class="gray-bg">
<div class="passwordBox2 animated fadeInDown">
<div class="row">
<div class="col-md-12">
<div class="ibox-content">
<div>
<img src="{{ LOGO_URL }}" style="margin: auto" width="82" height="82">
<h2 style="display: inline">
{{ JMS_TITLE }}
</h2>
</div>
{% if errors %}
<p>
<div class="alert alert-danger">
{{ errors }}
</div>
</p>
{% endif %}
{% if messages %}
<p>
<div class="alert alert-success" id="messages">
{{ messages|safe }}
</div>
</p>
{% endif %}
<div class="row">
<div class="col-lg-3">
<a href="{{ redirect_url }}" class="btn btn-primary block full-width m-b">{% trans 'Return' %}</a>
</div>
</div>
</div>
{% block content %}
<div>
{% if errors %}
<p>
<div class="alert alert-danger">
{{ errors }}
</div>
</div>
<hr/>
</p>
{% endif %}
{% if messages %}
<p>
<div class="alert alert-success" id="messages">
{{ messages|safe }}
</div>
</p>
{% endif %}
<div class="row">
<div class="col-md-6">
{% include '_copyright.html' %}
<div class="col-lg-3">
<a href="{{ redirect_url }}" class="btn btn-primary block full-width m-b">{% trans 'Return' %}</a>
</div>
</div>
</div>
</body>
{% endblock %}
{% block custom_foot_js %}
<script>
var time = '{{ interval }}';
if (!time){
if (!time) {
time = 5;
} else {
time = parseInt(time);
}
function redirect_page() {
if (time >= 0) {
var messages = '{{ messages|safe }}， <b>' + time +'</b> ...';
var messages = '{{ messages|safe }}， <b>' + time + '</b> ...';
$('#messages').html(messages);
time--;
setTimeout(redirect_page, 1000);
}
else {
} else {
window.location.href = "{{ redirect_url }}";
}
}
{% if auto_redirect %}
window.onload = redirect_page;
window.onload = redirect_page;
{% endif %}
</script>
</html>
{% endblock %}