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(binary field): Wrong naming and scope of variable #29603

Merged
merged 11 commits into from
Aug 15, 2024
Merged

fix(binary field): Wrong naming and scope of variable #29603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
091fe63
call setBinaryFieldInputs on save
zJaaal Aug 12, 2024
42d6d97
Merge branch 'master' into 28337-binary-field-information-of-assets-n…
zJaaal Aug 12, 2024
cb606fa
make contenletIdentifier global and check for definition of function
zJaaal Aug 12, 2024
55755ef
Merge branch 'master' into 28337-binary-field-information-of-assets-n…
zJaaal Aug 12, 2024
ab20661
Merge branch 'master' into 28337-binary-field-information-of-assets-n…
zJaaal Aug 13, 2024
983abb4
Merge branch 'master' into 28337-binary-field-information-of-assets-n…
zJaaal Aug 13, 2024
e2eeb27
Cover the case for multiple binary fields in one content type
zJaaal Aug 13, 2024
b97ce36
Merge branch '28337-binary-field-information-of-assets-needs-be-refre…
zJaaal Aug 15, 2024
319c7c3
Update edit_field.jsp
zJaaal Aug 15, 2024
8b8b98d
Update edit_field.jsp
zJaaal Aug 15, 2024
9e7a055
declare global variable correctly
zJaaal Aug 15, 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
5 changes: 3 additions & 2 deletions dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@

<script type="text/javascript">

var binaryFieldCallbacksMap = {} // This is a map to store the callbacks for the binary fields, used to reload them when we publish or save a contentlet, look on dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet_js_inc.jsp on saveContentCallback function
const relationsLoadedMap = {};

function waitForRelation() {
Expand Down Expand Up @@ -137,10 +138,10 @@

<script language="javascript">
require(["vs/editor/editor.main"], function() {
// Hack to avoid MonacoEditorLoaderService to load the editor again
// Hack to avoid MonacoEditorLoaderService to load the editor again
// That service not works in `dojo` environment Dojo amdLoader. See docs: [https://dojotoolkit.org/reference-guide/1.7/loader/amd.html?highlight=packages%20location%20name%20main]
window.monacoEditorAlreadyInitialized = !!window.monaco;
});
});
</script>

<%
Expand Down
11 changes: 3 additions & 8 deletions dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,6 @@
}
}
</style>

<script>
var binaryCallbacksMap = {} // This is a map to store the callbacks for the binary fields, used to reload them when we publish or save a contentlet, look on dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_contentlet_js_inc.jsp on saveContentCallback function
</script>


<div class="fieldWrapper" >
<div class="fieldName" id="<%=field.getVelocityVarName()%>_tag">
<% if (hint != null) {%>
Expand Down Expand Up @@ -882,9 +876,10 @@ var binaryCallbacksMap = {} // This is a map to store the callbacks for the bina

setBinaryFieldInputs(); // Initialize the binary Field


// This code covers the multiple binaries in a contentlet
if(!binaryCallbacksMap["<%=field.getVelocityVarName()%>"]) {
binaryCallbacksMap["<%=field.getVelocityVarName()%>"] = setBinaryFieldInputs; // Register the function to be called when the contentlet is saved
if(!binaryFieldCallbacksMap["<%=field.getVelocityVarName()%>"]) {
binaryFieldCallbacksMap["<%=field.getVelocityVarName()%>"] = setBinaryFieldInputs; // Register the function to be called when the contentlet is saved
}
</script>
<%}else{%>
Expand Down