-
-
-
-
-
+
+
+{% block content_table %}
+
+
- {% include '_filter_dropdown.html' %}
+
+
+{% include '_filter_dropdown.html' %}
+
{% endblock %}
+
{% block custom_foot_js %}
{% endblock %}
diff --git a/apps/users/templates/users/user_database_app_permission.html b/apps/users/templates/users/user_database_app_permission.html
new file mode 100644
index 000000000..73b3a7972
--- /dev/null
+++ b/apps/users/templates/users/user_database_app_permission.html
@@ -0,0 +1,168 @@
+{% extends 'users/_base_user_detail.html' %}
+{% load static %}
+{% load i18n %}
+
+{% block custom_head_css_js %}
+
+
+{% endblock %}
+
+{% block content_table %}
+
+
+
+{% endblock %}
+
+{% block custom_foot_js %}
+
+{% endblock %}
diff --git a/apps/users/templates/users/user_detail.html b/apps/users/templates/users/user_detail.html
index dab389362..7bac7a454 100644
--- a/apps/users/templates/users/user_detail.html
+++ b/apps/users/templates/users/user_detail.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'users/_base_user_detail.html' %}
{% load static %}
{% load i18n %}
@@ -6,311 +6,296 @@
{% endblock %}
-{% block content %}
-
-
-
-
-
- /', views.UserDetailView.as_view(), name='user-detail'),
path('user//assets/', views.UserGrantedAssetView.as_view(), name='user-granted-asset'),
path('user//asset-permissions/', views.UserAssetPermissionListView.as_view(), name='user-asset-permission'),
+ path('user//remote-apps/', views.UserGrantedRemoteAppView.as_view(), name='user-granted-remote-app'),
+ path('user//remote-app-permissions/', views.UserRemoteAppPermissionListView.as_view(), name='user-remote-app-permission'),
+ path('user//database-apps/', views.UserGrantedDatabasesAppView.as_view(), name='user-granted-database-app'),
+ path('user//database-app-permissions/', views.UserDatabaseAppPermissionListView.as_view(), name='user-database-app-permission'),
path('user//login-history/', views.UserDetailView.as_view(), name='user-login-history'),
# User group view
diff --git a/apps/users/views/user.py b/apps/users/views/user.py
index f1230d464..8e6650240 100644
--- a/apps/users/views/user.py
+++ b/apps/users/views/user.py
@@ -31,8 +31,10 @@ from ..signals import post_user_create
__all__ = [
'UserListView', 'UserCreateView', 'UserDetailView',
- 'UserUpdateView', 'UserGrantedAssetView',
- 'UserBulkUpdateView', 'UserAssetPermissionListView',
+ 'UserUpdateView', 'UserBulkUpdateView',
+ 'UserGrantedAssetView', 'UserAssetPermissionListView',
+ 'UserGrantedRemoteAppView', 'UserRemoteAppPermissionListView',
+ 'UserGrantedDatabasesAppView', 'UserDatabaseAppPermissionListView',
]
logger = get_logger(__name__)
@@ -164,7 +166,7 @@ class UserBulkUpdateView(PermissionsMixin, TemplateView):
class UserDetailView(PermissionsMixin, DetailView):
model = User
template_name = 'users/user_detail.html'
- context_object_name = "user_object"
+ context_object_name = "object"
key_prefix_block = "_LOGIN_BLOCK_{}"
permission_classes = [IsOrgAdmin]
@@ -220,3 +222,59 @@ class UserAssetPermissionListView(PermissionsMixin, DetailView):
}
kwargs.update(context)
return super().get_context_data(**kwargs)
+
+
+class UserGrantedRemoteAppView(PermissionsMixin, DetailView):
+ model = User
+ template_name = 'users/user_granted_remote_app.html'
+ permission_classes = [IsOrgAdmin]
+
+ def get_context_data(self, **kwargs):
+ context = {
+ 'app': _('Users'),
+ 'action': _('User granted RemoteApp'),
+ }
+ kwargs.update(context)
+ return super().get_context_data(**kwargs)
+
+
+class UserRemoteAppPermissionListView(PermissionsMixin, DetailView):
+ model = User
+ template_name = 'users/user_remote_app_permission.html'
+ permission_classes = [IsOrgAdmin]
+
+ def get_context_data(self, **kwargs):
+ context = {
+ 'app': _('Users'),
+ 'action': _('RemoteApp permission'),
+ }
+ kwargs.update(context)
+ return super().get_context_data(**kwargs)
+
+
+class UserGrantedDatabasesAppView(PermissionsMixin, DetailView):
+ model = User
+ template_name = 'users/user_granted_database_app.html'
+ permission_classes = [IsOrgAdmin]
+
+ def get_context_data(self, **kwargs):
+ context = {
+ 'app': _('Users'),
+ 'action': _('User granted DatabaseApp'),
+ }
+ kwargs.update(context)
+ return super().get_context_data(**kwargs)
+
+
+class UserDatabaseAppPermissionListView(PermissionsMixin, DetailView):
+ model = User
+ template_name = 'users/user_database_app_permission.html'
+ permission_classes = [IsOrgAdmin]
+
+ def get_context_data(self, **kwargs):
+ context = {
+ 'app': _('Users'),
+ 'action': _('DatabaseApp permission'),
+ }
+ kwargs.update(context)
+ return super().get_context_data(**kwargs)
-
+{% block content_table %}
+
-
-
-
-
-
-
-
-
-
- |
- |
- |
| {% trans 'Name' %}: | -{{ user_object.name }} | -
| {% trans 'Username' %}: | -{{ user_object.username }} | -
| {% trans 'Email' %}: | -{{ user_object.email }} | -
| {% trans 'Phone' %}: | -{{ user_object.phone }} | -
| {% trans 'Wechat' %}: | -{{ user_object.wechat }} | -
| {% trans 'Role' %}: | -{{ user_object.role_display }} | -
| {% trans 'MFA certification' %}: | -- {% if user_object.mfa_force_enabled %} - {% trans 'Force enabled' %} - {% elif user_object.mfa_enabled%} - {% trans 'Enabled' %} - {% else %} - {% trans 'Disabled' %} - {% endif %} - | -
| {% trans 'Source' %}: | -{{ user_object.get_source_display }} | -
| {% trans 'Date expired' %}: | -{{ user_object.date_expired|date:"Y-m-j H:i:s" }} | -
| {% trans 'Created by' %}: | -{{ user_object.created_by }} | -
| {% trans 'Date joined' %}: | -{{ user_object.date_joined|date:"Y-m-j H:i:s" }} | -
| {% trans 'Last login' %}: | -{{ user_object.last_login|date:"Y-m-j H:i:s" }} | -
| {% trans 'Last password updated' %}: | -{{ user_object.date_password_last_updated|date:"Y-m-j H:i:s" }} | -
| {% trans 'Comment' %}: | -{{ user_object.comment }} | -
-
+ {% trans 'Update' %}
+
+
+
+ {% trans 'Delete' %}
+
+
+{% endblock %}
- {% if user_object.can_user_current_org or user_object.can_admin_current_org %}
-
-
-
- {% if request.user.can_admin_current_org %}
+{% block content_nav_delete_update %}
+
- {% trans 'Quick modify' %}
-
-
-
-
-
-
- | {% trans 'Active' %}: | -
-
-
-
-
-
-
- |
-
| {% trans 'Force enabled MFA' %}: | -
-
-
-
-
-
-
-
-
- |
-
| {% trans 'Reset MFA' %}: | -- - - - | -
| {% trans 'Send reset password mail' %}: | -- - - - | -
| {% trans 'Send reset ssh key mail' %}: | -- - - - | -
-
- {% endif %}
-
- {% if LICENSE_VALID and LOGIN_CONFIRM_ENABLE %}
-
- {% trans 'User group' %}
-
-
-
-
-
-
- {% for group in user_object.groups.all %}
-
-
- | - {{ group.name }} - | -- - | -
-
- {% endif %}
-
- {% endif %}
-
- {% trans 'Login confirm' %}
-
-
-
-
-
- {% if user_object.get_login_confirm_setting %}
- {% for u in user_object.login_confirm_setting.reviewers.all %}
-
-
- | - {{ u }} - | -- - | -
+
- {% include 'users/_user_update_pk_modal.html' %}
+
+
+
+
+
+
+
|
+ |
+ |
| {% trans 'Name' %}: | +{{ object.name }} | +
| {% trans 'Username' %}: | +{{ object.username }} | +
| {% trans 'Email' %}: | +{{ object.email }} | +
| {% trans 'Phone' %}: | +{{ object.phone }} | +
| {% trans 'Wechat' %}: | +{{ object.wechat }} | +
| {% trans 'Role' %}: | +{{ object.role_display }} | +
| {% trans 'MFA certification' %}: | ++ {% if object.mfa_force_enabled %} + {% trans 'Force enabled' %} + {% elif object.mfa_enabled%} + {% trans 'Enabled' %} + {% else %} + {% trans 'Disabled' %} + {% endif %} + | +
| {% trans 'Source' %}: | +{{ object.get_source_display }} | +
| {% trans 'Date expired' %}: | +{{ object.date_expired|date:"Y-m-j H:i:s" }} | +
| {% trans 'Created by' %}: | +{{ object.created_by }} | +
| {% trans 'Date joined' %}: | +{{ object.date_joined|date:"Y-m-j H:i:s" }} | +
| {% trans 'Last login' %}: | +{{ object.last_login|date:"Y-m-j H:i:s" }} | +
| {% trans 'Last password updated' %}: | +{{ object.date_password_last_updated|date:"Y-m-j H:i:s" }} | +
| {% trans 'Comment' %}: | +{{ object.comment }} | +
+
+
+{% include 'users/_user_update_pk_modal.html' %}
+
{% endblock %}
+
{% block custom_foot_js %}
{% endblock %}
-{% block content %}
-
+
+ {% if request.user.can_admin_current_org %}
+
+ {% if object.can_user_current_org or object.can_admin_current_org %}
+
+ {% trans 'Quick modify' %}
+
+
+
+
+
+
+ | {% trans 'Active' %}: | +
+
+
+
+
+
+
+
+
+ |
+
| {% trans 'Force enabled MFA' %}: | +
+
+
+
+
+
+
+
+
+ |
+
| {% trans 'Reset MFA' %}: | ++ + + + | +
| {% trans 'Send reset password mail' %}: | ++ + + + | +
| {% trans 'Send reset ssh key mail' %}: | ++ + + + | +
+
+ {% endif %}
+
+ {% if LICENSE_VALID and LOGIN_CONFIRM_ENABLE %}
+
+ {% trans 'User group' %}
+
+
+
+
+
+
+ {% for group in object.groups.all %}
+
+
+ | + {{ group.name }} + | ++ + | +
+
+ {% endif %}
+
+ {% endif %}
+
+ {% trans 'Login confirm' %}
+
+
+
+
+
+ {% if object.get_login_confirm_setting %}
+ {% for u in object.login_confirm_setting.reviewers.all %}
+
+
+ | + {{ u }} + | ++ + | +
-
+
+{% block content_table %}
+{% include 'users/_granted_assets.html' %}
{% endblock %}
+
{% block custom_foot_js %}
+{% endblock %}
+
+{% block content_table %}
+
-
-
-
-
-
-
-
- {% include 'users/_granted_assets.html' %}
-
-
+
+
+{% endblock %}
+
+{% block custom_foot_js %}
+
+{% endblock %}
diff --git a/apps/users/templates/users/user_granted_remote_app.html b/apps/users/templates/users/user_granted_remote_app.html
new file mode 100644
index 000000000..19b8ab22c
--- /dev/null
+++ b/apps/users/templates/users/user_granted_remote_app.html
@@ -0,0 +1,93 @@
+{% extends 'users/_base_user_detail.html' %}
+{% load i18n static %}
+
+{% block custom_head_css_js %}
+
+{% endblock %}
+
+{% block content_table %}
+
+
+
+{% endblock %}
+
+{% block custom_foot_js %}
+
+{% endblock %}
diff --git a/apps/users/templates/users/user_group_list.html b/apps/users/templates/users/user_group_list.html
index d06cbec6b..5e354d3db 100644
--- a/apps/users/templates/users/user_group_list.html
+++ b/apps/users/templates/users/user_group_list.html
@@ -62,7 +62,7 @@ function initTable() {
],
ajax_url: '{% url "api-users:user-group-list" %}',
columns: [{data: "id"}, {data: "name" }, {data: "users_amount", orderable: false},
- {data: "comment"}, {data: "id", orderable: false, width:"100px"}],
+ {data: "comment"}, {data: "id", orderable: false, width: "120px"}],
op_html: $('#actions').html()
};
groupsTable = jumpserver.initServerSideDataTable(options);
diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html
index 5ba8ac95a..63dd981be 100644
--- a/apps/users/templates/users/user_list.html
+++ b/apps/users/templates/users/user_list.html
@@ -121,7 +121,7 @@ function initTable() {
{data: "groups_display", orderable: false},
{data: "source"},
{data: "is_valid", orderable: false, width: "50px"},
- {data: "id", orderable: false, width: "100px"}
+ {data: "id", orderable: false, width: "120px"}
],
op_html: $('#actions').html()
};
diff --git a/apps/users/templates/users/user_remote_app_permission.html b/apps/users/templates/users/user_remote_app_permission.html
new file mode 100644
index 000000000..d1f6aabb7
--- /dev/null
+++ b/apps/users/templates/users/user_remote_app_permission.html
@@ -0,0 +1,168 @@
+{% extends 'users/_base_user_detail.html' %}
+{% load static %}
+{% load i18n %}
+
+{% block custom_head_css_js %}
+
+
+{% endblock %}
+
+{% block content_table %}
+
+
+
+{% endblock %}
+
+{% block custom_foot_js %}
+
+{% endblock %}
diff --git a/apps/users/urls/views_urls.py b/apps/users/urls/views_urls.py
index cd5888f8c..7773ca7d6 100644
--- a/apps/users/urls/views_urls.py
+++ b/apps/users/urls/views_urls.py
@@ -36,6 +36,10 @@ urlpatterns = [
path('user/