Modify project statucure guide and init data

README.md

@@ -23,7 +23,7 @@
         
         cp config-example.py config.py
         
-        cd apps/ && python manage.py loaddata users  # 初始化数据
+        cd apps/ && python manage.py loaddata init  # 初始化数据
         
         python manage.py runserver 0.0.0.0:80
         

apps/users/fixtures/users

@@ -1 +0,0 @@
-[{"model": "users.role", "pk": 1, "fields": {"name": "Administrator", "date_added": "2016-08-20T17:03:42.631Z", "created_by": "System", "comment": "\u7ba1\u7406\u5458", "permissions": [16, 17, 18, 19, 20, 21, 10, 11, 12, 13, 14, 15, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 1, 2, 3, 4, 5, 6, 7, 8, 9]}}, {"model": "users.role", "pk": 2, "fields": {"name": "User", "date_added": "2016-08-20T17:03:42.671Z", "created_by": "System", "comment": "\u7528\u6237", "permissions": []}}, {"model": "users.role", "pk": 3, "fields": {"name": "Auditor", "date_added": "2016-08-20T17:03:42.683Z", "created_by": "System", "comment": "\u5ba1\u8ba1\u5458", "permissions": []}}, {"model": "users.usergroup", "pk": 1, "fields": {"name": "ALL", "comment": "Default usergroup for all user", "date_added": "2016-08-20T17:03:42.693Z", "created_by": "System"}}, {"model": "users.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$30000$xZUhPadgI8rs$n2rm5futcOv7Ww4b4BflN8K90Vk3u7ozfnOS7GQq0ns=", "last_login": null, "is_superuser": false, "first_name": "", "last_name": "", "is_staff": false, "is_active": true, "date_joined": "2016-08-20T17:03:42.752Z", "username": "admin", "name": "Administrator", "email": "admin@jumpserver.org", "avatar": "", "wechat": "", "phone": "", "enable_otp": false, "secret_key_otp": "", "role": 1, "private_key": "", "public_key": "", "comment": "Administrator is the super user of system", "date_expired": "2086-08-03T17:03:42.753Z", "created_by": "System", "user_permissions": [], "groups": [1]}}]

apps/users/fixtures/users.json

@@ -1 +0,0 @@
-[{"model": "users.role", "pk": 1, "fields": {"name": "Administrator", "date_added": "2016-08-20T17:03:42.631Z", "created_by": "System", "comment": "\u7ba1\u7406\u5458", "permissions": [16, 17, 18, 19, 20, 21, 10, 11, 12, 13, 14, 15, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 1, 2, 3, 4, 5, 6, 7, 8, 9]}}, {"model": "users.role", "pk": 2, "fields": {"name": "User", "date_added": "2016-08-20T17:03:42.671Z", "created_by": "System", "comment": "\u7528\u6237", "permissions": []}}, {"model": "users.role", "pk": 3, "fields": {"name": "Auditor", "date_added": "2016-08-20T17:03:42.683Z", "created_by": "System", "comment": "\u5ba1\u8ba1\u5458", "permissions": []}}, {"model": "users.usergroup", "pk": 1, "fields": {"name": "ALL", "comment": "Default usergroup for all user", "date_added": "2016-08-20T17:03:42.693Z", "created_by": "System"}}, {"model": "users.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$30000$xZUhPadgI8rs$n2rm5futcOv7Ww4b4BflN8K90Vk3u7ozfnOS7GQq0ns=", "last_login": null, "is_superuser": false, "first_name": "", "last_name": "", "is_staff": false, "is_active": true, "date_joined": "2016-08-20T17:03:42.752Z", "username": "admin", "name": "Administrator", "email": "admin@jumpserver.org", "avatar": "", "wechat": "", "phone": "", "enable_otp": false, "secret_key_otp": "", "role": 1, "private_key": "", "public_key": "", "comment": "Administrator is the super user of system", "date_expired": "2086-08-03T17:03:42.753Z", "created_by": "System", "user_permissions": [], "groups": [1]}}]

apps/users/forms.py

@@ -22,7 +22,7 @@ class UserAddForm(ModelForm):
         }
 
         widgets = {
-            'groups': forms.SelectMultiple(attrs={'class': 'chosen-select', 'data-placeholder': '请选择用户组'})
+            'groups': forms.SelectMultiple(attrs={'class': 'chosen-select', 'data-placeholder': '请选择用户组'}),
         }
 
 

apps/users/templates/users/_user.html

@@ -3,6 +3,7 @@
 {% load bootstrap %}
 {% block custom_head_css_js %}
     <link href="{% static "css/plugins/chosen/chosen.css" %}" rel="stylesheet">
+    <link href="{% static "css/plugins/datepicker/datepicker3.css" %}" rel="stylesheet">
     <script src="{% static "js/plugins/chosen/chosen.jquery.min.js" %}"></script>
 {% endblock %}
 
@@ -40,7 +41,15 @@
                             <div class="hr-line-dashed"></div>
                             <h3>角色安全</h3>
                             {{ form.role|bootstrap_horizontal }}
-                            {{ form.date_expired|bootstrap_horizontal }}
+                            <div class="form-group" id="date_5">
+                                <label for="{{ form.date_expired.id_for_label }}" class="col-sm-2 control-label">{{ form.date_expired.label }}</label>
+                                <div class="col-sm-9">
+                                    <div class="input-group date">
+                                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                        <input id="{{ form.date_expired.id_for_label }}" name="{{ form.data_expired.name }}" type="text" class="form-control" value="03/04/2014">
+                                    </div>
+                                </div>
+                             </div>
                             <div class="form-group">
                                 <label for="{{ form.enable_otp.id_for_label }}" class="col-sm-2 control-label">二次验证</label>
                                 <div class="col-sm-8">
@@ -67,6 +76,7 @@
     </div>
 {% endblock %}
 {% block custom_foot_js %}
+    <script src="{% static 'js/plugins/datapicker/bootstrap-datepicker.js' %}"></script>
     <script>
         $(document).ready(function () {
             var config = {
@@ -79,6 +89,14 @@
             for (var selector in config) {
                 $(selector).chosen(config[selector]);
             }
+
+            $('.input-group.date').datepicker({
+                todayBtn: "linked",
+                keyboardNavigation: false,
+                forceParse: false,
+                calendarWeeks: true,
+                autoclose: true
+            });
         })
     </script>
 {% endblock %}

docs/project_structure.md

@@ -31,6 +31,13 @@
 │   │   ├── urls.py                 // urlconf文件
 │   │   ├── utils.py                // 将views和api可复用的代码放在这里, api和views只是请求和返回不同
 │   │   └── views.py                // views文件
+│   ├── common 
+│   │   ├── templatetags            // 通用template tag
+│   │   ├── utils.py                // 通用的函数方法
+│   │   └── views.py                
+│   ├── fixtures                     // 初始化数据目录
+│   │   ├── init.json               // 初始化项目数据库
+│   │   └── fake.json               // 生成大量测试数据
 │   ├── jumpserver                  // 项目设置目录
 │   │    ├── __init__.py
 │   │    ├── settings.py            // 项目设置文件