Commit b38b28dc authored by enured's avatar enured
Browse files

F9052 CodeMirror feature für im Report angepasst: Fensterrückmeldung ersetzt...

F9052 CodeMirror feature für im Report angepasst: Fensterrückmeldung ersetzt durch kurzzeitig erscheinenden Badge unter dem Button. Externes Fenster wird von Anfang an mit passender URL geladen.
parent b2402f14
Pipeline #6979 passed with stage
in 1 minute and 57 seconds
...@@ -108,6 +108,11 @@ $(document).ready(function(){ ...@@ -108,6 +108,11 @@ $(document).ready(function(){
var urlParams = new URLSearchParams(window.location.search); var urlParams = new URLSearchParams(window.location.search);
var ttContentParam = urlParams.get('tt-content'); var ttContentParam = urlParams.get('tt-content');
var pageId = urlParams.get('id'); var pageId = urlParams.get('id');
if(pageId === null){
pageId = '';
}else{
pageId = 'id='+pageId+'&';
}
if(ttContentParam !== null && $(targetEditReportButton).next("#"+ttContentParam)[0] !== undefined){ if(ttContentParam !== null && $(targetEditReportButton).next("#"+ttContentParam)[0] !== undefined){
var formContent = $($(targetEditReportButton).next("#"+ttContentParam)[0].outerHTML); var formContent = $($(targetEditReportButton).next("#"+ttContentParam)[0].outerHTML);
...@@ -117,18 +122,23 @@ $(document).ready(function(){ ...@@ -117,18 +122,23 @@ $(document).ready(function(){
// execute changes(post) and reload page with id of tt-content as get parameter. Staying in same window with new content. // execute changes(post) and reload page with id of tt-content as get parameter. Staying in same window with new content.
$(externWindow).submit(function() { $(externWindow).submit(function() {
$.post($(externWindow).attr('action'),$(externWindow).serializeArray()); $.post($(externWindow).attr('action'),$(externWindow).serializeArray());
alert("Changes have been saved. Reload your primary window after that."); $('<div style="text-align: right; margin-top: 10px;"><span style="background-color: green;" class="badge badge-success">Saved</span></div>')
if(pageId === null){ .insertAfter('.btn-default')
pageId = ''; .delay(3000)
}else{ .fadeOut(function() {
pageId = 'id='+pageId+'&'; $(this).remove();
} });
if(window.location.search !== '?'+"tt-content="+$('form').attr('id')){ if(window.location.search !== '?'+pageId+"tt-content="+$('form').attr('id')){
window.location.href = '//' + location.host + location.pathname + "?" +pageId+ "tt-content=" + $('form').attr('id'); window.location.href = '//' + location.host + location.pathname + "?" +pageId+ "tt-content=" + $('form').attr('id');
} }
return false; return false;
}); });
// Refresh new window with correct url
if($(externWindow).length !== 0 && window.location.search !== '?'+pageId+"tt-content="+$('form').attr('id')){
window.location.href = '//' + location.host + location.pathname + "?" +pageId+ "tt-content=" + $('form').attr('id');
}
// enable CodeMirror for extern window // enable CodeMirror for extern window
$(externWindow).children("[class=qfq-codemirror]").each( $(externWindow).children("[class=qfq-codemirror]").each(
function () { function () {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment