Skip to content
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

Jump to bottom

🐛 Fix: 'cancel' button redirects to console instead of portal #387

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

🐛 Fix: 'cancel' button redirects to console instead of portal #387

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b3f1ea
* Fix for 'cancel' button in portal
jbostoen Jan 16, 2023
fc841aa
Update datamodels/2.x/itop-portal-base/portal/public/js/portal_form_h…
jbostoen Jan 17, 2023
79f5886
Update datamodels/2.x/itop-portal-base/portal/public/js/portal_form_h…
jbostoen Jan 17, 2023
f15d3fb
Update datamodels/2.x/itop-portal-base/portal/public/js/portal_form_h…
Molkobain Jan 17, 2023
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
22 changes: 17 additions & 5 deletions datamodels/2.x/itop-portal-base/portal/public/js/portal_form_handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,12 +426,24 @@ $(function()
}
else
{
// Try to close the window
window.close();

if(window.history.length == 1) {

jbostoen marked this conversation as resolved.
Show resolved Hide resolved
// Not a modal, but there is no other history.
// Try to close the window.
window.close();

// In some browser (eg. Firefox 70), window won't close if it has NOT been open by JS. In that case, we try to redirect to homepage as a fallback.
var sHomepageUrl = (this.options.base_url !== null) ? this.options.base_url : $('#sidebar .menu .brick_menu_item:first a').attr('href')
window.location.href = sHomepageUrl;
// In some browser (eg. Firefox 70), window won't close if it has NOT been open by JS. In that case, we try to redirect to homepage as a fallback.
var sHomepageUrl = (this.options.base_url !== null) ? this.options.base_url : $('#sidebar .menu .brick_menu_item:first a').attr('href')
window.location.href = sHomepageUrl;

}
else {

Molkobain marked this conversation as resolved.
Show resolved Hide resolved
window.history.back(-1);

jbostoen marked this conversation as resolved.
Show resolved Hide resolved
}

}
},
submit: function(oEvent)
Expand Down
2 changes: 1 addition & 1 deletion datamodels/2.x/itop-portal-base/portal/templates/bricks/object/mode_create.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
field_set: oFieldSet_{{ sFormIdSanitized }},
submit_btn_selector: $('#{{ sFormId }}').parent().find('.form_btn_submit, .form_btn_transition'),
cancel_btn_selector: $('#{{ sFormId }}').parent().find('.form_btn_cancel'),
base_url: "{{ app['combodo.absolute_url'] }}",
base_url: "{{ app['combodo.portal.base.absolute_url'] }}",
{% if form.submit_rule is not null %}submit_rule: {{ form.submit_rule|json_encode|raw }}{% endif %},
{% if form.cancel_rule is not null %}cancel_rule: {{ form.cancel_rule|json_encode|raw }}{% endif %},
endpoint: "{{ form.renderer.GetEndpoint()|raw }}",
Expand Down