NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot: manage falsy value for frontend_url

Browse Source
This commit is contained in:
Xavier-Do 2022-08-29 15:08:23 +02:00 committed by xdo
parent e27a1b8f71
commit 903ee7d983
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runbot/controllers/frontend.py
View File

@ -512,7 +512,7 @@ class Runbot(Controller):
('slot_ids.batch_id.bundle_id', '=', bundle_id), ('slot_ids.batch_id.bundle_id', '=', bundle_id),
('params_id.trigger_id', '=', trigger.id), ('params_id.trigger_id', '=', trigger.id),
] ]
builds = request.env['runbot.build'] builds = request.env['runbot.build'].with_context(active_test=False)
if center_build_id: if center_build_id:
builds = builds.search( builds = builds.search(
expression.AND([builds_domain, [('id', '>=', center_build_id)]]), expression.AND([builds_domain, [('id', '>=', center_build_id)]]),

16
runbot/static/src/js/json_field.js
View File

@ -42,13 +42,21 @@ var FrontendUrl = relational_fields.FieldMany2One.extend({
events: _.extend({'click .external_link': '_stopPropagation'}, relational_fields.FieldMany2One.prototype.events), events: _.extend({'click .external_link': '_stopPropagation'}, relational_fields.FieldMany2One.prototype.events),
init() { init() {
this._super.apply(this, arguments); this._super.apply(this, arguments);
const model = this.value.model.split('.').slice(1).join('_') if (this.value) {
const res_id = this.value.res_id const model = this.value.model.split('.').slice(1).join('_');
this.route = '/runbot/' + model+ '/' + res_id const res_id = this.value.res_id;
this.route = '/runbot/' + model+ '/' + res_id;
} else {
this.route = false;
}
}, },
_renderReadonly: function () { _renderReadonly: function () {
this._super.apply(this, arguments); this._super.apply(this, arguments);
this.$el.html('<span>' + this.$el.html() + ' <a href="'+this.route+'" ><i class="external_link fa fa-fw o_button_icon fa-external-link "/></a><span>') var link = ''
if (this.route) {
link = ' <a href="'+this.route+'" ><i class="external_link fa fa-fw o_button_icon fa-external-link "/></a>'
}
this.$el.html('<span>' + this.$el.html() + link + '<span>')
}, },
_stopPropagation: function(event) { _stopPropagation: function(event) {
event.stopPropagation() event.stopPropagation()