redmine_plugins/redmine_issue_dynamic_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

json API fix, cleanURL added and history fix

Browse Source 
Removed usage of json API to check version, implemented @MayamaTakeshi cleanURL fix and chronological history order update
This commit is contained in:
Hugo Zilliox 2023-12-06 13:35:29 +01:00
parent 17714c542b
commit f4f2862db7
2 changed files with 34 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
assets/javascripts/issue_dynamic_edit.js
View File

@ -24,7 +24,8 @@ const SVG_CANCEL = '<svg style="width: 1em; height: 1em;" version="1.1" viewBox=
* Allow inclusion from other page * Allow inclusion from other page
* See https://github.com/Ilogeek/redmine_issue_dynamic_edit/commit/26684a2dd9b12dcc7377afd79e9fe5c142d26ebd for more info * See https://github.com/Ilogeek/redmine_issue_dynamic_edit/commit/26684a2dd9b12dcc7377afd79e9fe5c142d26ebd for more info
*/ */
let LOCATION_HREF = typeof custom_location_href !== 'undefined' ? custom_location_href : window.location.href; const cleanURL = function(url){ let u = new URL(url); return `${nu.protocol}//${nu.host}${nu.pathname}`; }
let LOCATION_HREF = typeof custom_location_href !== 'undefined' ? cleanURL(custom_location_href) : cleanURL(window.location.href);
if (_CONF_FORCE_HTTPS) { if (_CONF_FORCE_HTTPS) {
LOCATION_HREF = LOCATION_HREF.replace(/^http:\/\//i, 'https://'); LOCATION_HREF = LOCATION_HREF.replace(/^http:\/\//i, 'https://');
@ -125,11 +126,6 @@ const cloneEditForm = function(){
btn_refresh.innerHTML = "&#10227;"; btn_refresh.innerHTML = "&#10227;";
document.querySelector('.issue.details div.subject').insertBefore(btn_refresh, null); document.querySelector('.issue.details div.subject').insertBefore(btn_refresh, null);
const wrapper = document.createElement('form');
wrapper.setAttribute('id', 'fakeDynamicForm');
document.querySelector('.issue.details').parentNode.insertBefore(wrapper, document.querySelector('.issue.details'));
wrapper.appendChild(document.querySelector('.issue.details'));
document.querySelectorAll('div.issue.details .attribute').forEach(function(elt){ document.querySelectorAll('div.issue.details .attribute').forEach(function(elt){
const classList = elt.classList.value.split(/\s+/); const classList = elt.classList.value.split(/\s+/);
@ -211,7 +207,7 @@ document.querySelector('body').addEventListener(_CONF_LISTENER_TYPE_VALUE,
let selector = e.target.closest('.value'); let selector = e.target.closest('.value');
if(is_description) selector = e.target.closest('.description'); if(is_description) selector = e.target.closest('.description');
if(is_subject) selector = e.target.closest('.subject'); if(is_subject) selector = e.target.closest('.subject');
selector.querySelector('.dynamicEditField').classList.add('open'); if(selector.querySelector('.dynamicEditField')) selector.querySelector('.dynamicEditField').classList.add('open');
} }
} }
}); });
@ -226,7 +222,7 @@ document.querySelector('body').addEventListener(_CONF_LISTENER_TYPE_ICON, functi
let selector = e.target.closest('.value'); let selector = e.target.closest('.value');
if(is_description) selector = e.target.closest('.description'); if(is_description) selector = e.target.closest('.description');
if(is_subject) selector = e.target.closest('.subject'); if(is_subject) selector = e.target.closest('.subject');
selector.querySelector('.dynamicEditField').classList.add('open'); if(selector.querySelector('.dynamicEditField')) selector.querySelector('.dynamicEditField').classList.add('open');
} }
}); });
@ -281,7 +277,7 @@ document.onkeydown = function(evt) {
} }
}; };
const getVersion = function(callback){ const checkVersion = function(callback){
fetch(LOCATION_HREF, { fetch(LOCATION_HREF, {
method: 'GET', method: 'GET',
crossDomain: true, crossDomain: true,
@ -289,6 +285,22 @@ const getVersion = function(callback){
const parser = new DOMParser(); const parser = new DOMParser();
const doc = parser.parseFromString(data, 'text/html'); const doc = parser.parseFromString(data, 'text/html');
const distant_version = doc.querySelector('#issue_lock_version').value; const distant_version = doc.querySelector('#issue_lock_version').value;
const current_version = document.querySelector('#issue_lock_version').value;
if(distant_version > current_version){
if(!document.querySelectorAll('#content .conflict').length){
let msg = document.createElement('div');
msg.classList.add('conflict');
msg.innerHTML = `${_TXT_CONFLICT_TITLE}
<div class="conflict-details">
<div class="conflict-journal">
<p><a href='#' onClick="window.location.href=window.location.href">${_TXT_CONFLICT_LINK}</a> <strong>${_TXT_CONFLICT_TXT}</strong></p>
</div>
</div>`
document.querySelector('#content').insertBefore(msg, document.querySelector('#content').firstChild);
}
}
if(callback) callback(distant_version); if(callback) callback(distant_version);
return distant_version; return distant_version;
}).catch(err => { }).catch(err => {
@ -297,43 +309,6 @@ const getVersion = function(callback){
}); });
} }
let loadedDate = new Date();
const checkVersion = function(callback){
fetch(LOCATION_HREF + ".json", {
method: 'GET',
crossDomain: true,
}).then(res => res.text()).then(data => {
try {
const parsedData = JSON.parse(data);
const lastUpdate = new Date(parsedData.issue.updated_on);
if(lastUpdate > loadedDate){
loadedDate = lastUpdate;
if(!document.querySelectorAll('#content .conflict').length){
let msg = document.createElement('div');
msg.classList.add('conflict');
msg.innerHTML = `${_TXT_CONFLICT_TITLE}
<div class="conflict-details">
<div class="conflict-journal">
<p><a href='#' onClick="window.location.href=window.location.href">${_TXT_CONFLICT_LINK}</a> <strong>${_TXT_CONFLICT_TXT}</strong></p>
</div>
</div>`
document.querySelector('#content').insertBefore(msg, document.querySelector('#content').firstChild);
}
if(callback) getVersion(callback);
} else {
if(callback) callback(parseInt(document.querySelector('#issue_lock_version').value));
}
} catch (e) {
throw new Error('Error occured: ', e);
}
}).catch(err => {
console.warn('Issue while trying to get version (avoiding conflict)');
console.log(err);
});
}
let checkVersionInterval = false; let checkVersionInterval = false;
let setCheckVersionInterval = function(activate){ let setCheckVersionInterval = function(activate){
if(!_CONF_CHECK_ISSUE_UPDATE_CONFLICT) return false; if(!_CONF_CHECK_ISSUE_UPDATE_CONFLICT) return false;
@ -406,12 +381,18 @@ let sendData = function(serialized_data){
if(document.querySelector("#errorExplanation")) document.querySelector("#errorExplanation").remove(); if(document.querySelector("#errorExplanation")) document.querySelector("#errorExplanation").remove();
} }
document.querySelector('form#issue-form').innerHTML = doc.querySelector('form#issue-form').innerHTML; if(document.querySelector('form#issue-form')) document.querySelector('form#issue-form').innerHTML = doc.querySelector('form#issue-form').innerHTML;
document.querySelector('#all_attributes').innerHTML = doc.querySelector('#all_attributes').innerHTML; if(document.querySelector('#all_attributes')) document.querySelector('#all_attributes').innerHTML = doc.querySelector('#all_attributes').innerHTML;
document.querySelector('div.issue.details').innerHTML = doc.querySelector('div.issue.details').innerHTML; if(document.querySelector('div.issue.details')) document.querySelector('div.issue.details').innerHTML = doc.querySelector('div.issue.details').innerHTML;
document.querySelector('#tab-content-history').appendChild(doc.querySelector('#history .journal.has-details:last-child')); if(document.querySelector('#issue_lock_version')) document.querySelector('#issue_lock_version').value = doc.querySelector("#issue_lock_version").value;
document.querySelector('#issue_lock_version').value = doc.querySelector("#issue_lock_version").value; if(document.querySelector('#tab-content-history')) {
if(_COMMENTS_IN_REVERSE_ORDER) {
document.querySelector('#tab-content-history').insertAdjacentElement('afterbegin', doc.querySelector('#history .journal.has-details:first-child'));
} else {
document.querySelector('#tab-content-history').appendChild(doc.querySelector('#history .journal.has-details:last-child'));
}
}
cloneEditForm(); cloneEditForm();
//set datepicker fallback for input type date //set datepicker fallback for input type date

1
lib/details_issue_hooks.rb
View File

@ -31,6 +31,7 @@ class DetailsIssueHooks < Redmine::Hook::ViewListener
content << " const _TXT_CONFLICT_TITLE = \"" + l(:ide_txt_notice_conflict_title) + "\";\n" content << " const _TXT_CONFLICT_TITLE = \"" + l(:ide_txt_notice_conflict_title) + "\";\n"
content << " const _TXT_CONFLICT_TXT = \"" + l(:ide_txt_notice_conflict_text) + "\";\n" content << " const _TXT_CONFLICT_TXT = \"" + l(:ide_txt_notice_conflict_text) + "\";\n"
content << " const _TXT_CONFLICT_LINK = \"" + l(:ide_txt_notice_conflict_link) + "\";\n" content << " const _TXT_CONFLICT_LINK = \"" + l(:ide_txt_notice_conflict_link) + "\";\n"
content << " const _COMMENTS_IN_REVERSE_ORDER = #{User.current.wants_comments_in_reverse_order? ? 'true' : 'false'};\n"
content << "</script>\n" content << "</script>\n"
content << "<style>/* PRINT MEDIAQUERY */\n" content << "<style>/* PRINT MEDIAQUERY */\n"
content << "@media print {\n" content << "@media print {\n"