Skip to content

Commit 721b5b3

Browse files
committed
fix(cr): remove duplicate role attributes and fix manifest data loading
1 parent 0cf9dcc commit 721b5b3

File tree

6 files changed

+22
-14
lines changed

6 files changed

+22
-14
lines changed

spp_change_request_v2/__manifest__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,12 @@
5656
# Data
5757
"data/dms_directories.xml",
5858
"data/sequences.xml",
59-
"data/default_types.xml",
6059
"data/event_types.xml",
6160
"data/user_roles.xml",
6261
],
62+
"oca_data_manual": [
63+
"data/default_types.xml",
64+
],
6365
"assets": {
6466
"web.assets_backend": [
6567
"spp_change_request_v2/static/src/components/**/*",

spp_change_request_v2/views/change_request_views.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@
281281
<!-- Target Type Information Banner -->
282282
<div
283283
class="alert alert-secondary py-2"
284-
role="status"
284+
role="alert"
285285
invisible="not target_type_message"
286286
>
287287
<div class="d-flex align-items-center">
@@ -336,7 +336,7 @@
336336
<!-- Revision Needed Banner -->
337337
<div
338338
class="alert alert-warning"
339-
role="status"
339+
role="alert"
340340
invisible="approval_state != 'revision'"
341341
>
342342
<div class="d-flex align-items-center">
@@ -354,7 +354,7 @@
354354
<!-- Ready to Finalize Banner -->
355355
<div
356356
class="alert alert-success"
357-
role="status"
357+
role="alert"
358358
invisible="approval_state != 'approved' or is_applied"
359359
>
360360
<div class="d-flex align-items-center">
@@ -374,7 +374,7 @@
374374
<!-- Multi-tier Approval Progress Banner -->
375375
<div
376376
class="alert alert-info"
377-
role="status"
377+
role="alert"
378378
invisible="not multitier_approval_message"
379379
>
380380
<div class="d-flex align-items-center">

spp_change_request_v2/views/conflict_extensions.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@
232232
<!-- WARNING: Less alarming banner -->
233233
<div
234234
class="alert alert-warning"
235-
role="status"
235+
role="alert"
236236
invisible="conflict_status != 'warning'"
237237
>
238238
<div class="d-flex align-items-center">
@@ -255,7 +255,7 @@
255255
<!-- OVERRIDDEN: Success banner with collapsible details -->
256256
<div
257257
class="alert alert-success"
258-
role="status"
258+
role="alert"
259259
invisible="conflict_status != 'overridden'"
260260
>
261261
<div class="d-flex align-items-center">

spp_change_request_v2/views/create_wizard_views.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<!-- Target type info -->
3636
<div
3737
class="alert alert-secondary py-2"
38-
role="status"
38+
role="alert"
3939
invisible="not target_type_message"
4040
>
4141
<div class="d-flex align-items-center">
@@ -78,7 +78,7 @@
7878
<!-- Selected registrant info -->
7979
<div
8080
class="alert alert-success py-2 mb-3"
81-
role="status"
81+
role="alert"
8282
invisible="not registrant_id"
8383
>
8484
<field name="registrant_info_html" nolabel="1" readonly="1" />

spp_change_request_v2/views/stage_documents_form.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<!-- Context banner -->
4848
<div
4949
class="alert alert-light border d-flex align-items-center mb-4 py-2"
50+
role="alert"
5051
>
5152
<i class="fa fa-file-text fa-lg text-primary me-3" />
5253
<field name="stage_banner_html" nolabel="1" readonly="1" />

spp_change_request_v2/views/stage_review_form.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
<!-- Context banner -->
148148
<div
149149
class="alert alert-light border d-flex align-items-center mb-4 py-2"
150+
role="alert"
150151
>
151152
<i class="fa fa-search fa-lg text-primary me-3" />
152153
<field name="stage_banner_html" nolabel="1" readonly="1" />
@@ -155,7 +156,7 @@
155156
<!-- Revision feedback banner (for creator in revision state) -->
156157
<div
157158
class="alert alert-warning"
158-
role="status"
159+
role="alert"
159160
invisible="approval_state != 'revision' or not revision_notes"
160161
>
161162
<div class="d-flex align-items-center">
@@ -174,7 +175,7 @@
174175
<!-- Rejection reason banner -->
175176
<div
176177
class="alert alert-danger"
177-
role="status"
178+
role="alert"
178179
invisible="approval_state != 'rejected' or not rejection_reason"
179180
>
180181
<div class="d-flex align-items-center">
@@ -193,7 +194,7 @@
193194
<!-- Approval status banner -->
194195
<div
195196
class="alert alert-info"
196-
role="status"
197+
role="alert"
197198
invisible="not multitier_approval_message"
198199
>
199200
<div class="d-flex align-items-center">
@@ -205,7 +206,11 @@
205206
</div>
206207

207208
<!-- Review instruction -->
208-
<div class="alert alert-warning mb-3 py-2" invisible="is_applied">
209+
<div
210+
class="alert alert-warning mb-3 py-2"
211+
role="alert"
212+
invisible="is_applied"
213+
>
209214
<i class="fa fa-exclamation-triangle me-2" />
210215
Review the changes below.
211216
</div>
@@ -223,7 +228,7 @@
223228
</div>
224229
</page>
225230
<page string="Attached Documents" name="attached_documents">
226-
<div class="alert alert-warning mb-3 py-2">
231+
<div class="alert alert-warning mb-3 py-2" role="alert">
227232
<i class="fa fa-exclamation-triangle me-2" />
228233
Only images and PDF files can be previewed. Other file types must be downloaded to view.
229234
</div>

0 commit comments

Comments
 (0)