Browse Source

small code cleanup

Rafał Pitoń 10 years ago
parent
commit
14ea1e926f

+ 6 - 4
misago/emberapp/app/components/forms/edit-signature-form.js

@@ -7,7 +7,7 @@ export default Ember.Component.extend({
   isSaving: false,
   isSaving: false,
   isErrored: false,
   isErrored: false,
 
 
-  options: '',
+  options: null,
   signature: '',
   signature: '',
 
 
   apiUrl: function() {
   apiUrl: function() {
@@ -19,9 +19,11 @@ export default Ember.Component.extend({
     this.ajax.get(this.get('apiUrl')
     this.ajax.get(this.get('apiUrl')
     ).then(function(options) {
     ).then(function(options) {
       if (self.isDestroyed) { return; }
       if (self.isDestroyed) { return; }
-      self.set('options', Ember.Object.create(options));
-      self.set('signature', self.get('options.signature.plain') || '');
-      self.set('isLoaded', true);
+      self.setProperties({
+        'options': Ember.Object.create(options),
+        'signature': self.get('options.signature.plain') || '',
+        'isLoaded': true
+      });
     }, function(jqXHR) {
     }, function(jqXHR) {
       if (self.isDestroyed) { return; }
       if (self.isDestroyed) { return; }
       if (typeof jqXHR.responseJSON !== 'undefined') {
       if (typeof jqXHR.responseJSON !== 'undefined') {

+ 30 - 2
misago/users/serializers/user.py

@@ -6,7 +6,12 @@ from misago.acl import serialize_acl
 
 
 from misago.users.serializers import RankSerializer
 from misago.users.serializers import RankSerializer
 
 
-__ALL__ = ['AuthenticatedUserSerializer', 'AnonymousUserSerializer']
+__all__ = [
+    'AuthenticatedUserSerializer',
+    'AnonymousUserSerializer',
+    'BasicUserSerializer',
+    'UserSerializer',
+]
 
 
 
 
 class AuthenticatedUserSerializer(serializers.ModelSerializer):
 class AuthenticatedUserSerializer(serializers.ModelSerializer):
@@ -34,7 +39,8 @@ class AuthenticatedUserSerializer(serializers.ModelSerializer):
             'subscribe_to_replied_threads',
             'subscribe_to_replied_threads',
             'threads',
             'threads',
             'posts',
             'posts',
-            'acl')
+            'acl'
+        )
 
 
     def get_acl(self, obj):
     def get_acl(self, obj):
         return serialize_acl(obj)
         return serialize_acl(obj)
@@ -46,3 +52,25 @@ class AnonymousUserSerializer(serializers.Serializer):
 
 
     def get_acl(self, obj):
     def get_acl(self, obj):
         return serialize_acl(obj)
         return serialize_acl(obj)
+
+
+class BasicUserSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = get_user_model()
+        fields = (
+            'id',
+            'username',
+            'slug',
+            'avatar_hash'
+        )
+
+
+class UserSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = get_user_model()
+        fields = (
+            'id',
+            'username',
+            'slug',
+            'avatar_hash'
+        )

+ 1 - 1
misago/users/tests/test_user_signature_api.py

@@ -17,7 +17,7 @@ class UserSignatureTests(AuthenticatedUserTestCase):
         self.link = '/api/users/%s/signature/' % self.user.pk
         self.link = '/api/users/%s/signature/' % self.user.pk
 
 
     def test_signature_no_permission(self):
     def test_signature_no_permission(self):
-        """edit signature view with no ACL returns 403"""
+        """edit signature api with no ACL returns 403"""
         override_acl(self.user, {
         override_acl(self.user, {
             'can_have_signature': 0,
             'can_have_signature': 0,
         })
         })