[update]

mitama-org · Mar 4, 2021 · 21dcc22 · 21dcc22
1 parent 688b9fb
commit 21dcc22
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/mitama/app/forms/__init__.py b/mitama/app/forms/__init__.py
@@ -25,10 +25,11 @@ def __init__(self, data=None):
                         k_ = k.split('.')
                         name = k_[0]
                         key = '.'.join(k_[1:])
-                        if field.listed:
-                            field.data[key] = data.getlist(k)
-                        else:
-                            field.data[key] = data.get(k)
+                        if name == field.name:
+                            if field.listed:
+                                field.data[key] = data.getlist(k)
+                            else:
+                                field.data[key] = data.get(k)
             elif field.listed:
                 field.data = data.getlist(field.name)
             elif field.name in data:

diff --git a/mitama/portal/controller.py b/mitama/portal/controller.py
@@ -235,19 +235,19 @@ def settings(self, request):
                     role.screen_name = form['role_screen_name']
                     role.name = form['role_name'] if form['role_name'] is not None else form['role_screen_name']
                     role.create()
-                for role_screen_name, role_permissions in form['role'].items():
-                    role = Role.retrieve(screen_name = role_screen_name)
-                    role.permissions = [Permission.retrieve(screen_name=permission) for permission in role_permissions]
-                    role.update()
+                for permission_screen_name, permission_roles in form['permission'].items():
+                    permission = Permission.retrieve(screen_name = permission_screen_name)
+                    permission.roles = [Role.retrieve(screen_name=role) for role in permission_roles]
+                    permission.update()
                 if form["inner_role_screen_name"] is not None:
                     inner_role = InnerRole()
                     inner_role.screen_name = form['inner_role_screen_name']
                     inner_role.name = form['inner_role_name'] if form['inner_role_name'] is not None else form['inner_role_screen_name']
                     inner_role.create()
-                for inner_role_screen_name, inner_role_permissions in form['inner_role'].items():
-                    inner_role = InnerRole.retrieve(screen_name = inner_role_screen_name)
-                    inner_role.permissions = [InnerPermission.retrieve(screen_name=permission) for permission in inner_role_permissions]
-                    inner_role.update()
+                for inner_permission_screen_name, inner_permission_roles in form['inner_permission'].items():
+                    inner_permission = InnerPermission.retrieve(screen_name=inner_permission_screen_name)
+                    inner_permission.roles = [InnerRole.retrieve(screen_name=role) for role in inner_permission_roles]
+                    inner_permission.update()
                 with open(self.app.project_dir / "welcome_message.md", "w") as f:
                     f.write(welcome_message_)
                 error = "変更を保存しました"

diff --git a/mitama/portal/forms.py b/mitama/portal/forms.py
@@ -8,10 +8,10 @@ class SettingsForm(Form):
     welcome_message = Field(label="ウェルカムボード", required=True)
     role_name = Field(label='役割名')
     role_screen_name = Field(label='役割ID', regex=r'^([0-9a-zA-Z_-]+)$')
-    role = DictField(listed=True)
+    permission = DictField(listed=True)
     inner_role_name = Field(label='グループ役割名')
     inner_role_screen_name = Field(label='グループ役割ID', regex=r'^([0-9a-zA-Z_-]+)$')
-    inner_role = DictField(listed=True)
+    inner_permission = DictField(listed=True)
 
 class LoginForm(Form):
     screen_name = Field(label="ログイン名", required=True)

diff --git a/mitama/portal/templates/settings.html b/mitama/portal/templates/settings.html
@@ -35,8 +35,8 @@ <h4 class='mt-3 mb-3'>権限割り当て</h4>
                     <td>
                         <input
                             type='checkbox'
-                            name='role.{{role.screen_name}}'
-                            value='{{permission.screen_name}}'
+                            name='permission.{{permission.screen_name}}'
+                            value='{{role.screen_name}}'
                             {% if role in permission.roles %}
                             checked
                             {% endif %}
@@ -71,8 +71,8 @@ <h4 class='mt-3 mb-3'>グループ内権限割り当て</h4>
                     <td>
                         <input
                             type='checkbox'
-                            name='inner_role.{{role.screen_name}}'
-                            value='{{permission.screen_name}}'
+                            name='inner_permission.{{permission.screen_name}}'
+                            value='{{role.screen_name}}'
                             {% if role in permission.roles %}
                             checked
                             {% endif %}

diff --git a/mitama/project/project.py b/mitama/project/project.py
@@ -6,6 +6,7 @@
 import inspect
 import smtplib
 import argparse
+from traceback import print_exc
 from pathlib import Path, PosixPath
 from email.mime.text import MIMEText
 import json
@@ -112,7 +113,7 @@ def wsgi(self, env, start_response):
             DatabaseManager.start_session()
             body = super().wsgi(env, start_response)
         except Exception as err:
-            print(err)
+            print_exc(err)
             DatabaseManager.rollback_session()
             request = Request(env)
             body = self.error(request, 500).start(request, start_response)