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; diff --git a/room/controllers/main_room_yuthon.py b/room/controllers/main_room_yuthon.py index e591b8e7d..736f880f9 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": user_obj.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'" 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 @@ -