Bläddra i källkod

rename display_name as public_name in endpoint

Guénaël Muller 6 år sedan
förälder
incheckning
144dafc9b3

+ 4 - 0
tracim/models/context_models.py Visa fil

91
         return self.user.user_id
91
         return self.user.user_id
92
 
92
 
93
     @property
93
     @property
94
+    def public_name(self) -> str:
95
+        return self.display_name
96
+
97
+    @property
94
     def display_name(self) -> str:
98
     def display_name(self) -> str:
95
         return self.user.display_name
99
         return self.user.display_name
96
 
100
 

+ 2 - 2
tracim/tests/functional/test_session.py Visa fil

45
             params=params,
45
             params=params,
46
             status=200,
46
             status=200,
47
         )
47
         )
48
-        assert res.json_body['display_name'] == 'Global manager'
48
+        assert res.json_body['public_name'] == 'Global manager'
49
         assert res.json_body['email'] == 'admin@admin.admin'
49
         assert res.json_body['email'] == 'admin@admin.admin'
50
         assert res.json_body['created']
50
         assert res.json_body['created']
51
         assert res.json_body['is_active']
51
         assert res.json_body['is_active']
103
             )
103
             )
104
         )
104
         )
105
         res = self.testapp.get('/api/v2/sessions/whoami', status=200)
105
         res = self.testapp.get('/api/v2/sessions/whoami', status=200)
106
-        assert res.json_body['display_name'] == 'Global manager'
106
+        assert res.json_body['public_name'] == 'Global manager'
107
         assert res.json_body['email'] == 'admin@admin.admin'
107
         assert res.json_body['email'] == 'admin@admin.admin'
108
         assert res.json_body['created']
108
         assert res.json_body['created']
109
         assert res.json_body['is_active']
109
         assert res.json_body['is_active']

+ 1 - 1
tracim/tests/functional/test_workspaces.py Visa fil

158
         assert user_role['role'] == 'workspace-manager'
158
         assert user_role['role'] == 'workspace-manager'
159
         assert user_role['user_id'] == 1
159
         assert user_role['user_id'] == 1
160
         assert user_role['workspace_id'] == 1
160
         assert user_role['workspace_id'] == 1
161
-        assert user_role['user']['display_name'] == 'Global manager'
161
+        assert user_role['user']['public_name'] == 'Global manager'
162
         # TODO - G.M - 24-05-2018 - [Avatar] Replace
162
         # TODO - G.M - 24-05-2018 - [Avatar] Replace
163
         # by correct value when avatar feature will be enabled
163
         # by correct value when avatar feature will be enabled
164
         assert user_role['user']['avatar_url'] is None
164
         assert user_role['user']['avatar_url'] is None

+ 2 - 2
tracim/views/core_api/schemas.py Visa fil

34
         required=True,
34
         required=True,
35
         example='suri.cate@algoo.fr'
35
         example='suri.cate@algoo.fr'
36
     )
36
     )
37
-    display_name = marshmallow.fields.String(
37
+    public_name = marshmallow.fields.String(
38
         example='Suri Cate',
38
         example='Suri Cate',
39
     )
39
     )
40
     created = marshmallow.fields.DateTime(
40
     created = marshmallow.fields.DateTime(
214
     user_id = marshmallow.fields.Int(example=3)
214
     user_id = marshmallow.fields.Int(example=3)
215
     workspace_id = marshmallow.fields.Int(example=4)
215
     workspace_id = marshmallow.fields.Int(example=4)
216
     user = marshmallow.fields.Nested(
216
     user = marshmallow.fields.Nested(
217
-        UserSchema(only=('display_name', 'avatar_url'))
217
+        UserSchema(only=('public_name', 'avatar_url'))
218
     )
218
     )
219
 
219
 
220
     class Meta:
220
     class Meta: