From 4f2b62158a6d38be2069b76f0df5f974f6688a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=81=A5=E6=98=8E?= <liangjm@shulan.com>
Date: Mon, 2 Sep 2024 21:47:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 room/controllers/main_room_yuthon.py | 58 +++++++++++++++++-----------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/room/controllers/main_room_yuthon.py b/room/controllers/main_room_yuthon.py
index e591b8e7d..9dd620a9a 100644
--- a/room/controllers/main_room_yuthon.py
+++ b/room/controllers/main_room_yuthon.py
@@ -20,32 +20,44 @@ class Home(http.Controller):
     def web_login(self, room_id=None, **kw):
         ensure_db()
         values = {k: v for k, v in request.params.items()}
-
         if not room_id:
             values['error'] = "缺少会议号"
-        else:
-            values['room_id'] = int(room_id)
-            if request.httprequest.method == 'POST':
-                try:
-                    record = request.env['room.booking'].sudo().browse(values['room_id'])
-                    if values.get("name", "") and request.env['hr.employee'].sudo().search([("name", "=", values.get("name", ""))]):
-                        user_type = "insiders"
-                    else:
-                        user_type = "outsiders"
-                    request.env["room.meeting.sign"].sudo().create({
-                        "room_booking_id": record.id,
-                        "sign_user_name": values.get("name", ""),
-                        "user_type": user_type,
-                        "sign_type": 'yes'
-                    })
-                    # pass
-                    values["message"] = "签到成功"
-                except odoo.exceptions.AccessDenied as e:
-                    if e.args == odoo.exceptions.AccessDenied().args:
-                        values['error'] = "重复签到"
-                    else:
-                        values['error'] = "签到失败"
+            response = request.render('website_form_room.website_form_room', values)
+            response.headers['X-Frame-Options'] = 'SAMEORIGIN'
+            response.headers['Content-Security-Policy'] = "frame-ancestors 'self'"
+            return response
+        if request.session.uid is not None:
+            user_obj = request.env['res.users'].browse(request.session.uid)
+            if user_obj:
+                request.env["room.meeting.sign"].sudo().create({
+                    "room_booking_id": room_id,
+                    "sign_user_name": values.get("name", ""),
+                    "user_type": "insiders",
+                    "sign_type": 'yes'
+                })
+            values["message"] = "签到成功"
+            response = request.render('website_form_room.website_form_room', values)
+            response.headers['X-Frame-Options'] = 'SAMEORIGIN'
+            response.headers['Content-Security-Policy'] = "frame-ancestors 'self'"
+            return response
 
+        values['room_id'] = int(room_id)
+        if request.httprequest.method == 'POST':
+            try:
+                record = request.env['room.booking'].sudo().browse(values['room_id'])
+                request.env["room.meeting.sign"].sudo().create({
+                    "room_booking_id": record.id,
+                    "sign_user_name": values.get("name", ""),
+                    "user_type": "outsiders",
+                    "sign_type": 'yes'
+                })
+                # pass
+                values["message"] = "签到成功"
+            except odoo.exceptions.AccessDenied as e:
+                if e.args == odoo.exceptions.AccessDenied().args:
+                    values['error'] = "重复签到"
+                else:
+                    values['error'] = "签到失败"
         response = request.render('website_form_room.website_form_room', values)
         response.headers['X-Frame-Options'] = 'SAMEORIGIN'
         response.headers['Content-Security-Policy'] = "frame-ancestors 'self'"

From 3d4e741e1b6f55f4135c9d2e79f54357448e09a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Mon, 2 Sep 2024 22:04:30 +0800
Subject: [PATCH 2/3] pengyuthon

---
 room/controllers/main_room_yuthon.py | 2 +-
 room/views/webclient_templates.xml   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/room/controllers/main_room_yuthon.py b/room/controllers/main_room_yuthon.py
index 9dd620a9a..736f880f9 100644
--- a/room/controllers/main_room_yuthon.py
+++ b/room/controllers/main_room_yuthon.py
@@ -31,7 +31,7 @@ class Home(http.Controller):
             if user_obj:
                 request.env["room.meeting.sign"].sudo().create({
                     "room_booking_id": room_id,
-                    "sign_user_name": values.get("name", ""),
+                    "sign_user_name": user_obj.name,
                     "user_type": "insiders",
                     "sign_type": 'yes'
                 })
diff --git a/room/views/webclient_templates.xml b/room/views/webclient_templates.xml
index eefd3307a..ff8fa22e2 100644
--- a/room/views/webclient_templates.xml
+++ b/room/views/webclient_templates.xml
@@ -54,10 +54,10 @@
                         <input type="text" placeholder="名字" name="name" t-att-value="name" id="name" t-attf-class="form-control" required="required" autofocus="autofocus" autocapitalize="off"/>
                     </div>
 
-                    <div class="mb-3">
-                        <label for="password" class="form-label">Password</label>
-                        <input type="password" placeholder="Password" name="password" id="password" t-attf-class="form-control" required="required" t-att-autofocus="'autofocus' if name else None" maxlength="4096"/>
-                    </div>
+<!--                    <div class="mb-3">-->
+<!--                        <label for="password" class="form-label">Password</label>-->
+<!--                        <input type="password" placeholder="Password" name="password" id="password" t-attf-class="form-control" required="required" t-att-autofocus="'autofocus' if name else None" maxlength="4096"/>-->
+<!--                    </div>-->
 
                     <p class="alert alert-danger" t-if="error" role="alert">
                         <t t-esc="error"/>

From b07b8005e17edb48433d71fbed49e552770b182c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Wed, 4 Sep 2024 11:16:49 +0800
Subject: [PATCH 3/3] pengyuthon

---
 .../static/src/scss/list_view_sticky_header_and_column.scss    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/list_view_sticky_header_and_column/static/src/scss/list_view_sticky_header_and_column.scss b/list_view_sticky_header_and_column/static/src/scss/list_view_sticky_header_and_column.scss
index d5f7b8740..27bf4fabf 100644
--- a/list_view_sticky_header_and_column/static/src/scss/list_view_sticky_header_and_column.scss
+++ b/list_view_sticky_header_and_column/static/src/scss/list_view_sticky_header_and_column.scss
@@ -27,6 +27,9 @@
 .o_list_view .table-responsive .table thead {
     z-index: 5;
 }
+.table {
+    width: -webkit-fill-available !important;
+}
 .o_list_renderer .o_list_table thead {
     position: sticky;
     top: 0;