[Fixture] 添加用户profile

apps/static/css/plugins/cropper/cropper.min.css

+/*!
+ * Cropper v0.7.6-beta
+ * https://github.com/fengyuanchen/cropper
+ *
+ * Copyright 2014 Fengyuan Chen
+ * Released under the MIT license
+ */
+
+.cropper-container{position:relative;overflow:hidden;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-tap-highlight-color:transparent;-webkit-touch-callout:none}.cropper-container img{width:100%;height:100%;min-width:0!important;min-height:0!important;max-width:none!important;max-height:none!important}.cropper-modal,.cropper-canvas{position:absolute;top:0;right:0;bottom:0;left:0}.cropper-canvas{background-color:#fff;opacity:0;filter:alpha(opacity=0)}.cropper-modal{background-color:#000;opacity:.5;filter:alpha(opacity=50)}.cropper-dragger{position:absolute;top:10%;left:10%;width:80%;height:80%}.cropper-viewer{display:block;width:100%;height:100%;overflow:hidden;outline-width:1px;outline-style:solid;outline-color:#69f;outline-color:rgba(51,102,255,.75)}.cropper-dashed{position:absolute;display:block;border:0 dashed #fff;opacity:.5;filter:alpha(opacity=50)}.cropper-dashed.dashed-h{top:33.3%;left:0;width:100%;height:33.3%;border-top-width:1px;border-bottom-width:1px}.cropper-dashed.dashed-v{top:0;left:33.3%;width:33.3%;height:100%;border-right-width:1px;border-left-width:1px}.cropper-face,.cropper-line,.cropper-point{position:absolute;display:block;width:100%;height:100%;opacity:.1;filter:alpha(opacity=10)}.cropper-face{top:0;left:0;cursor:move;background-color:#fff}.cropper-line{background-color:#69f}.cropper-line.line-e{top:0;right:-3px;width:5px;cursor:e-resize}.cropper-line.line-n{top:-3px;left:0;height:5px;cursor:n-resize}.cropper-line.line-w{top:0;left:-3px;width:5px;cursor:w-resize}.cropper-line.line-s{bottom:-3px;left:0;height:5px;cursor:s-resize}.cropper-point{width:5px;height:5px;background-color:#69f;opacity:.75;filter:alpha(opacity=75)}.cropper-point.point-e{top:50%;right:-3px;margin-top:-3px;cursor:e-resize}.cropper-point.point-n{top:-3px;left:50%;margin-left:-3px;cursor:n-resize}.cropper-point.point-w{top:50%;left:-3px;margin-top:-3px;cursor:w-resize}.cropper-point.point-s{bottom:-3px;left:50%;margin-left:-3px;cursor:s-resize}.cropper-point.point-ne{top:-3px;right:-3px;cursor:ne-resize}.cropper-point.point-nw{top:-3px;left:-3px;cursor:nw-resize}.cropper-point.point-sw{bottom:-3px;left:-3px;cursor:sw-resize}.cropper-point.point-se{right:-3px;bottom:-3px;width:20px;height:20px;cursor:se-resize;opacity:1;filter:alpha(opacity=100)}.cropper-point.point-se:before{position:absolute;right:-50%;bottom:-50%;display:block;width:200%;height:200%;content:" ";background-color:#69f;opacity:0;filter:alpha(opacity=0)}@media (min-width:768px){.cropper-point.point-se{width:15px;height:15px}}@media (min-width:992px){.cropper-point.point-se{width:10px;height:10px}}@media (min-width:1200px){.cropper-point.point-se{width:5px;height:5px;opacity:.75;filter:alpha(opacity=75)}}.cropper-hidden{display:none!important}.cropper-invisible{position:fixed;top:0;left:0;z-index:-1;width:auto!important;max-width:none!important;height:auto!important;max-height:none!important;opacity:0;filter:alpha(opacity=0)}.cropper-move{cursor:move}.cropper-crop{cursor:crosshair}.cropper-disabled .cropper-canvas,.cropper-disabled .cropper-face,.cropper-disabled .cropper-line,.cropper-disabled .cropper-point{cursor:not-allowed}
\ No newline at end of file

apps/templates/_nav_user.html

@@ -16,7 +16,7 @@
 </li>
 <li id="applications">
     <a href="{% url 'users:user-profile' %}">
-        <i class="fa fa-user" ></i> <span class="nav-label">{% trans 'Terminal' %}</span><span class="label label-info pull-right"></span>
+        <i class="fa fa-terminal" ></i> <span class="nav-label">{% trans 'Terminal' %}</span><span class="label label-info pull-right"></span>
     </a>
 </li>
 <li class="special_link">

apps/users/forms.py

@@ -37,6 +37,20 @@ class UserCreateUpdateForm(forms.ModelForm):
         }
 
 
+class UserProfileForm(forms.ModelForm):
+    class Meta:
+        model = User
+        fields = [
+            'username', 'name', 'email', 'groups', 'wechat',
+            'phone',
+        ]
+        help_texts = {
+            'username': '* required',
+            'name': '* required',
+            'email': '* required',
+        }
+
+
 class UserBulkImportForm(forms.ModelForm):
     class Meta:
         model = User

apps/users/models/user.py

@@ -100,6 +100,16 @@ class User(AbstractUser):
     def public_key(self, public_key_raw):
         self._public_key = signer.sign(public_key_raw)
 
+    @property
+    def public_key_hash(self):
+        if self.public_key:
+            import sshpubkeys
+            try:
+                return sshpubkeys.SSHKey(self.public_key).hash_md5()
+            except TabError:
+                pass
+        return 'None'
+
     @property
     def is_superuser(self):
         if self.role == 'Admin':

apps/users/templates/users/user_profile_update.html

+{% extends 'base.html' %}
+{% load static %}
+{% load i18n %}
+{% load bootstrap %}
+
+{% block custom_head_css_js %}
+    <link href="{% static "css/plugins/cropper/cropper.min.css" %}" rel="stylesheet">
+    <link href="{% static "css/plugins/sweetalert/sweetalert.css" %}" rel="stylesheet">
+    <script src="{% static "js/plugins/sweetalert/sweetalert.min.js" %}"></script>
+
+    <style>
+        .crop {
+            width: 200px;
+            height: 150px;
+            overflow: hidden;
+        }
+
+        .img-preview-sm img {
+            width: 64px;
+            height: 64px;
+            margin: -75px 0 0 -100px;
+        }
+    </style>
+{% endblock %}
+{% block content %}
+    <div class="wrapper wrapper-content animated fadeInRight">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="ibox float-e-margins">
+                    <div class="panel-options">
+                        <ul class="nav nav-tabs">
+                            <li class="active">
+                                <a href="" class="text-center">{% trans 'Profile' %} </a>
+                            </li>
+                            <li>
+                                <a href="" class="text-center">{% trans 'Password' %} </a>
+                            </li>
+                            <li>
+                                <a href="" class="text-center">{% trans 'Public key' %} </a>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="tab-content" style="background-color: #ffffff">
+                        <div class="wrapper wrapper-content animated fadeInRight">
+                                <form method="post" class="form-horizontal" action="" enctype="multipart/form-data">
+                                    {% csrf_token %}
+                                    <h3>{% trans 'Account' %}</h3>
+{#                                    {{ form.avatar|bootstrap_horizontal }}#}
+                                    {{ form.username|bootstrap_horizontal }}
+                                    {{ form.name|bootstrap_horizontal }}
+                                    {{ form.email|bootstrap_horizontal }}
+
+                                    <div class="hr-line-dashed"></div>
+                                    <h3>{% trans 'Profile' %}</h3>
+                                    {{ form.phone|bootstrap_horizontal }}
+                                    {{ form.wechat|bootstrap_horizontal }}
+                                    <div class="hr-line-dashed"></div>
+                                    <div class="form-group">
+                                        <div class="col-sm-4 col-sm-offset-2">
+                                            <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
+                                            <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
+                                        </div>
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+{% endblock %}
+
+{% block custom_foot_js %}
+    <script src="{% static 'js/plugins/cropper/cropper.min.js' %}"></script>
+    <script>
+    </script>
+{% endblock %}

apps/users/urls/views_urls.py

@@ -25,6 +25,9 @@ urlpatterns = [
     url(r'^profile/$',
         views.UserProfileView.as_view(),
         name='user-profile'),
+    url(r'^profile/update/$',
+        views.UserProfileUpdateView.as_view(),
+        name='user-profile-update'),
 
     # User view
     url(r'^user$', views.UserListView.as_view(), name='user-list'),

apps/users/views/user.py

@@ -36,7 +36,9 @@ from perms.models import AssetPermission
 __all__ = ['UserListView', 'UserCreateView', 'UserDetailView',
            'UserUpdateView', 'UserAssetPermissionCreateView',
            'UserAssetPermissionView', 'UserGrantedAssetView',
-           'UserExportView',  'UserBulkImportView', 'UserProfileView']
+           'UserExportView',  'UserBulkImportView', 'UserProfileView',
+           'UserProfileUpdateView',
+           ]
 
 logger = get_logger(__name__)
 
@@ -311,18 +313,40 @@ class UserProfileView(LoginRequiredMixin, TemplateView):
     template_name = 'users/user_profile.html'
 
     def get_context_data(self, **kwargs):
-        from perms.utils import (get_user_granted_assets,
-                                 get_user_granted_asset_groups,
-                                 get_user_asset_permissions)
+        from perms.utils import get_user_granted_assets
         assets = get_user_granted_assets(self.request.user)
-        asset_groups = get_user_granted_asset_groups(self.request.user)
-        permissions = get_user_asset_permissions(self.request.user)
         context = {
             'app': 'User',
             'action': 'User Profile',
             'assets': assets,
-            'asset_groups': asset_groups,
-            'permissions': permissions
         }
         kwargs.update(context)
         return super(UserProfileView, self).get_context_data(**kwargs)
+
+
+class UserProfileUpdateView(LoginRequiredMixin, UpdateView):
+    template_name = 'users/user_profile_update.html'
+    model = User
+    form_class = forms.UserProfileForm
+    success_url = reverse_lazy('users:user-profile')
+    success_message = _('Create user <a href="%s">%s</a> successfully.')
+
+    def get_object(self, queryset=None):
+        return self.request.user
+
+    def get_success_message(self, cleaned_data):
+        return self.success_message % (
+            reverse_lazy('users:user-detail', kwargs={'pk': self.object.pk}),
+            self.object.name,
+        )
+
+    def get_context_data(self, **kwargs):
+        from perms.utils import get_user_granted_assets
+        assets = get_user_granted_assets(self.request.user)
+        context = {
+            'app': 'User',
+            'action': 'User Profile',
+            'assets': assets,
+        }
+        kwargs.update(context)
+        return super(UserProfileUpdateView, self).get_context_data(**kwargs)
\ No newline at end of file