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

A2 87 bug in dissemination metadata #2497

Merged
merged 2 commits into from
Mar 22, 2024
+10 −6
Merged

A2 87 bug in dissemination metadata #2497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d953c51
:bug: fix(Dissemination): show dissemination channel
MetalPrime Mar 22, 2024
5bc447d
:wrench: chore(Dissemination): Dates update
MetalPrime Mar 22, 2024
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
2 changes: 1 addition & 1 deletion marlo-web/src/main/webapp/WEB-INF/crp/views/projects/projectDeliverable.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[#assign customJS = [
"${baseUrlMedia}/js/projects/deliverables/deliverableInfo.js?20240123",
"${baseUrlMedia}/js/projects/deliverables/deliverableShfrm.js?20240226",
"${baseUrlMedia}/js/projects/deliverables/deliverableDissemination.js?20230810",
"${baseUrlMedia}/js/projects/deliverables/deliverableDissemination.js?20240322",
"${baseUrlMedia}/js/projects/deliverables/deliverableQualityCheck.js?20220721",
"${baseUrlCdn}/crp/js/feedback/feedbackAutoImplementation.js?20240313",
[#-- "${baseUrlMedia}/js/projects/deliverables/deliverableDataSharing.js?20180523",--]
Expand Down
2 changes: 1 addition & 1 deletion marlo-web/src/main/webapp/WEB-INF/crp/views/publications/publication.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"${baseUrlMedia}/js/publications/publication.js?20190228",
"${baseUrlMedia}/js/projects/deliverables/deliverableQualityCheck.js?20190228",
"${baseUrlMedia}/js/projects/deliverables/deliverableInfo.js?20230417",
"${baseUrlMedia}/js/projects/deliverables/deliverableDissemination.js?20230810",
"${baseUrlMedia}/js/projects/deliverables/deliverableDissemination.js?20240322",
[#-- "${baseUrlCdn}/global/js/autoSave.js",--]
"${baseUrlCdn}/global/js/fieldsValidation.js?20180529"
] /]
Expand Down
2 changes: 1 addition & 1 deletion marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@
[#macro findableOptions ]
[#local isSynced = (deliverable.dissemination.synced)!false ]
[#local customName = "deliverable.dissemination" /]
<div class="disseminationChannelBlock" style="display:${isSynced?string('none','block')};">
<div class="disseminationChannelBlock" >
[#-- Note
<div class="note">[@s.text name="project.deliverable.dissemination.channelInfo" /]</div>
--]
Expand Down
10 changes: 7 additions & 3 deletions marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableDissemination.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,9 @@ function updateReadOnly() {
if ($('.deliverableDisseminationUrl ').prop('readonly')) {
getWOSInfo();
}
//if not
$('select[name="deliverable.dissemination.disseminationChannel"]').prop("disabled",true);
$('select').select2();
//if not
} else {

$('.WOS_tag').hide("slow");
Expand Down Expand Up @@ -788,6 +790,8 @@ function updateReadOnly() {
hideOrShowCheckBoxIsOtherUrl(true);
}
}
$('select[name="deliverable.dissemination.disseminationChannel"]').prop("disabled",false);
$('select').select2();

}

Expand Down Expand Up @@ -1482,8 +1486,8 @@ function setLicense(license) {
* Sync the deliverable in the interface and set as synced
*/
function syncDeliverable() {
// Hide Sync Button & dissemination channel
$('#fillMetadata .checkButton, .disseminationChannelBlock').hide('slow');
// Hide Sync Button
$('#fillMetadata .checkButton').hide('slow');
// Show UnSync & Update Button
$('#fillMetadata .unSyncBlock').show();
// Set hidden inputs
Expand Down
Loading