[fix]

mitama-org · Mar 4, 2021 · 89c5114 · 89c5114
1 parent 877df53
commit 89c5114
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/mitama/app/forms/fields.py b/mitama/app/forms/fields.py
@@ -223,11 +223,12 @@ def validate(self):
     @property
     def data(self):
         if self._data is not None:
-            if self._bin is not None:
-                return self._bin
-            else:
+            if self._bin is None:
                 self._bin = self._data.file.read()
+            if self._bin is not None or len(self._bin) > 0:
                 return self._bin
+            else:
+                return None
         elif self.initial is not None:
             return self.initial
         else:

diff --git a/mitama/portal/controller.py b/mitama/portal/controller.py
@@ -344,20 +344,12 @@ def update(self, req):
                 user.screen_name = form["screen_name"]
                 user.name = form["name"]
                 user.icon = resize_icon(form["icon"]) if form["icon"] is not None else user.icon
+                roles_ = []
                 for role in form["roles"]:
-                    user.roles.append(Role.retrieve(screen_name=role))
+                    roles_.append(Role.retrieve(screen_name=role))
+                user.roles = roles_
                 user.update()
-                return Response.render(
-                    template,
-                    {
-                        "message": "変更を保存しました",
-                        "user": user,
-                        "screen_name": user.screen_name,
-                        "name": user.name,
-                        "icon": user.icon,
-                        "roles": roles
-                    },
-                )
+                return Response.redirect(self.app.convert_url("/users/" + user.screen_name + "/settings"))
             except Exception as err:
                 error = str(err)
                 return Response.render(

diff --git a/mitama/portal/forms.py b/mitama/portal/forms.py
@@ -35,7 +35,7 @@ class InviteForm(Form):
 
 
 class UserUpdateForm(Form):
-    icon = FileField(label="プロフィール画像", initial=load_noimage_user())
+    icon = FileField(label="プロフィール画像")
     name = Field(label="名前", required=True)
     screen_name = Field(label="ログイン名")
     roles = Field(label="役割", listed=True)
@@ -49,7 +49,7 @@ class GroupCreateForm(Form):
 
 
 class GroupUpdateForm(Form):
-    icon = FileField(label="プロフィール画像", initial=load_noimage_group())
+    icon = FileField(label="プロフィール画像")
     name = Field(label="名前", required=True)
     screen_name = Field(label="ドメイン名", required=True)
     parent = Field(label="親グループ")