Skip to content

[IMP] runbot: preferences shown in dialog instead of collapse #1373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xavier-Do merged 1 commit into from
May 8, 2026
+119 −64
Merged

[IMP] runbot: preferences shown in dialog instead of collapse #1373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions runbot/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
'runbot/static/lib/fontawesome/css/font-awesome.css',
'runbot/static/src/css/runbot.css',

'runbot/static/src/js/polyfill_command_api.js',
'runbot/static/lib/jquery/jquery.js',
'runbot/static/lib/bootstrap/js/bootstrap.bundle.js',
'runbot/static/src/js/runbot.js',
Expand Down
16 changes: 16 additions & 0 deletions runbot/static/src/css/runbot.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,22 @@ table {
font-size: 0.875rem;
}

dialog.modal {
--bs-modal-zindex: auto;
margin: 0;
padding: 0;
border: none;
background-color: transparent;

&::backdrop {
background-color: rgba(0, 0, 0, 0.5);
}

&[open] {
display: block;
}
}

.fa {
line-height: inherit; /* reset fa icon line height to body height*/
}
Expand Down
28 changes: 28 additions & 0 deletions runbot/static/src/js/polyfill_command_api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// @odoo-module ignore
(function () {
if (
typeof HTMLButtonElement !== "undefined" &&
"command" in HTMLButtonElement.prototype &&
// eslint-disable-next-line no-undef
"source" in ((CommandEvent || {}).prototype || {})
) {
return;
}
const SUPPORTED_COMMANDS = {
"show-modal": "showModal",
"close": "close",
};
document.addEventListener("click", (ev) => {
const commandEl = ev.target.closest("[commandfor]");
if (!commandEl) {
return;
}
const forTarget = document.getElementById(commandEl.getAttribute("commandfor"));
const command = commandEl.getAttribute("command");
if (command in SUPPORTED_COMMANDS) {
forTarget[SUPPORTED_COMMANDS[command]]();
} else {
throw new Error(`UnsupportedCommand: ${command} is not a supported command.`);
}
});
})();
138 changes: 74 additions & 64 deletions runbot/templates/utils.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@
</t>
</t>
<li class="nav-item divider"/>
<li class="nav-item dropdown">
<a data-bs-toggle="collapse" href="#collapsePreference" role="button" class="nav-link">

<li class="nav-item">
<button command="show-modal" commandfor="collapsePreference" type="button" class="nav-link">
<i class="fa fa-gear"/>
</a>
</button>
</li>
<li class="nav-item divider" t-ignore="true"/>
<t t-if="not user_id._is_public()">
Expand Down Expand Up @@ -147,68 +147,78 @@
</div>
</div>
</div></div>
<div id="collapsePreference" class="collapse">
<form class="px-4 py-3" method="post" action="/runbot/submit" id="preferences_form">
<input type="hidden" name="redirect" t-att-value="current_path"/>
<div>
<div class="form-check form-switch">
<label for="more" class="form-check-label" >More info</label>
<input onclick="document.getElementById('preferences_form').submit()" class="form-check-input" type="checkbox" role="switch" id="more" name="more" t-att-checked="more"/>
</div></div>
<div>
<label for="theme_selection" style="min-width: 80px">Theme:</label>
<div id="theme_selection" class="text-nowrap btn-group btn-group-sm" role="group">
<button onclick="document.cookie = 'theme=legacy; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if theme=='legacy' else 'secondary'}}">Legacy</button>
<button onclick="document.cookie = 'theme=dark; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if theme=='dark' else 'secondary'}}">Dark</button>
<button onclick="document.cookie = 'theme=light; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if theme=='light' else 'secondary'}}">Light</button>
<button onclick="document.cookie = 'theme=red404; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if theme=='red404' else 'secondary'}}">Red404</button>
</div></div>
<div>
<label for="theme_selection" style="min-width: 80px">Sticky:</label>
<div class="text-nowrap btn-group btn-group-sm" role="group">
<button onclick="document.cookie = 'filter_mode=default; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if filter_mode=='default' else 'secondary'}}" help="Only display sticky except if searching">Default</button>
<button onclick="document.cookie = 'filter_mode=all; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if filter_mode=='all' else 'secondary'}}">All</button>
<button onclick="document.cookie = 'filter_mode=sticky; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if filter_mode=='sticky' else 'secondary'}}">Sticky only</button>
<button onclick="document.cookie = 'filter_mode=nosticky; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if filter_mode=='nosticky' else 'secondary'}}">Dev only</button>
</div></div>
<div>
<label for="theme_selection" style="min-width: 80px">Category:</label>
<div class="text-nowrap btn-group btn-group-sm" role="group">
<t t-foreach="categories" t-as="category">
<button t-attf-onclick="document.cookie = 'category={{category.id}}; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if category.id == active_category_id else 'secondary'}}" t-out="category.name"/>
</t>
</div></div>

<hr class="separator"/>
<div t-if="triggers">
<input type="hidden" name="update_triggers" t-att-value="project.id"/>
<t t-foreach="categories" t-as="category">
<t t-set="category_triggers" t-value="triggers.filtered(lambda t: not t.manual and t.category_id == category)"/>
<t t-if="category_triggers">
<h3 t-out="category.name"/>
<div class="row">
<t t-foreach="category_triggers" t-as="trigger">
<div class="col-md-3 text-nowrap">
<input t-attf-class="trigger_selection {{'trigger_selection_hide' if trigger.hide else 'trigger_selection_show'}}" type="checkbox" t-attf-name="trigger_{{trigger.id}}" t-attf-id="trigger_{{trigger.id}}" t-att-checked="not trigger.hide if trigger_display is None else trigger.id in trigger_display"/>
<label t-attf-for="trigger_{{trigger.id}}" t-out="trigger.name"/>
<dialog id="collapsePreference" class="modal modal-xl">
<div class="modal-dialog">
<form class="modal-content" method="post" action="/runbot/submit" id="preferences_form">
<header class="modal-header">
<h5 class="modal-title">Preferences</h5>
<button type="button" class="btn-close" command="close" commandfor="collapsePreference"/>
</header>
<div class="modal-body">
<input type="hidden" name="redirect" t-att-value="current_path"/>
<div>
<div class="form-check form-switch">
<label for="more" class="form-check-label" >More info</label>
<input onclick="document.getElementById('preferences_form').submit()" class="form-check-input" type="checkbox" role="switch" id="more" name="more" t-att-checked="more"/>
</div></div>
<div>
<label for="theme_selection" style="min-width: 80px">Theme:</label>
<div id="theme_selection" class="text-nowrap btn-group btn-group-sm" role="group">
<button onclick="document.cookie = 'theme=legacy; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if theme=='legacy' else 'secondary'}}">Legacy</button>
<button onclick="document.cookie = 'theme=dark; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if theme=='dark' else 'secondary'}}">Dark</button>
<button onclick="document.cookie = 'theme=light; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if theme=='light' else 'secondary'}}">Light</button>
<button onclick="document.cookie = 'theme=red404; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if theme=='red404' else 'secondary'}}">Red404</button>
</div></div>
<div>
<label for="theme_selection" style="min-width: 80px">Sticky:</label>
<div class="text-nowrap btn-group btn-group-sm" role="group">
<button onclick="document.cookie = 'filter_mode=default; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if filter_mode=='default' else 'secondary'}}" help="Only display sticky except if searching">Default</button>
<button onclick="document.cookie = 'filter_mode=all; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if filter_mode=='all' else 'secondary'}}">All</button>
<button onclick="document.cookie = 'filter_mode=sticky; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if filter_mode=='sticky' else 'secondary'}}">Sticky only</button>
<button onclick="document.cookie = 'filter_mode=nosticky; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if filter_mode=='nosticky' else 'secondary'}}">Dev only</button>
</div></div>
<div>
<label for="theme_selection" style="min-width: 80px">Category:</label>
<div class="text-nowrap btn-group btn-group-sm" role="group">
<t t-foreach="categories" t-as="category">
<button t-attf-onclick="document.cookie = 'category={{category.id}}; expires=Thu, 1 Dec 2942 12:00:00 UTC; path=/'; location.reload();" type="button" t-attf-class="btn btn-{{'primary' if category.id == active_category_id else 'secondary'}}" t-out="category.name"/>
</t>
</div></div>

<hr class="separator"/>
<div t-if="triggers">
<input type="hidden" name="update_triggers" t-att-value="project.id"/>
<t t-foreach="categories" t-as="category">
<t t-set="category_triggers" t-value="triggers.filtered(lambda t: not t.manual and t.category_id == category)"/>
<t t-if="category_triggers">
<h3 t-out="category.name"/>
<div class="row">
<t t-foreach="category_triggers" t-as="trigger">
<div class="col-md-3 text-nowrap">
<input t-attf-class="trigger_selection {{'trigger_selection_hide' if trigger.hide else 'trigger_selection_show'}}" type="checkbox" t-attf-name="trigger_{{trigger.id}}" t-attf-id="trigger_{{trigger.id}}" t-att-checked="not trigger.hide if trigger_display is None else trigger.id in trigger_display"/>
<label t-attf-for="trigger_{{trigger.id}}" t-out="trigger.name"/>
</div>
</t>
</div>
</t>
</div>
</t>
</t>
</div>
<button
onclick="Array.from(document.getElementsByClassName('trigger_selection_show')).forEach((element) => element.checked = true); Array.from(document.getElementsByClassName('trigger_selection_hide')).forEach((element) => element.checked = false); event.preventDefault();"
class="btn btn-secondary">Reset to default</button>
<button
onclick="Array.from(document.getElementsByClassName('trigger_selection')).forEach((element) => element.checked = true); event.preventDefault();"
class="btn btn-secondary">All</button>
<button
onclick="Array.from(document.getElementsByClassName('trigger_selection')).forEach((element) => element.checked = false); event.preventDefault();"
class="btn btn-secondary">None</button>
<button type="submit" class="btn btn-primary">Save</button>
</form>
</div>
</t>
</div>
</div>
<footer class="modal-footer">
<button
onclick="Array.from(document.getElementsByClassName('trigger_selection_show')).forEach((element) => element.checked = true); Array.from(document.getElementsByClassName('trigger_selection_hide')).forEach((element) => element.checked = false); event.preventDefault();"
class="btn btn-secondary">Reset to default</button>
<button
onclick="Array.from(document.getElementsByClassName('trigger_selection')).forEach((element) => element.checked = true); event.preventDefault();"
class="btn btn-secondary">All</button>
<button
onclick="Array.from(document.getElementsByClassName('trigger_selection')).forEach((element) => element.checked = false); event.preventDefault();"
class="btn btn-secondary">None</button>
<button type="submit" class="btn btn-primary">Save</button>
</footer>
</form>
</div>
</dialog>
<t t-out="0"/>
</body>
</xpath>
Expand Down