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

dotCMS/core#27522 Unable to edit content from Card view in content Search #27524

Merged
merged 6 commits into from
Feb 8, 2024
Merged

dotCMS/core#27522 Unable to edit content from Card view in content Search #27524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
493a831
add contentType param + clickable label
hmoreras Feb 6, 2024
e410ecb
send contentType correctly and update test
hmoreras Feb 6, 2024
a350837
cover event content type and click on thumbnail in table listing
hmoreras Feb 6, 2024
aedeb00
Merge branch 'master' into issue-not-sending-contentType-form-grid
hmoreras Feb 6, 2024
d81f6b6
Merge branch 'master' into issue-not-sending-contentType-form-grid
hmoreras Feb 7, 2024
1ca92bb
Merge branch 'master' into issue-not-sending-contentType-form-grid
oidacra Feb 7, 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
10 changes: 8 additions & 2 deletions .../portlets/shared/dot-content-types-edit/components/form/content-types-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,15 @@
class="content-type__new-content-banner"
*ngIf="newContentEditorEnabled"
data-test-id="content-type__new-content-banner">
<p-checkbox class="p-checkbox-sm" formControlName="newEditContent" binary="true">
<p-checkbox
class="p-checkbox-sm"
formControlName="newEditContent"
binary="true"
inputId="newEditContentLabel">
</p-checkbox>
<span [innerHTML]="'content.type.form.banner.message' | dm"></span>
<label for="newEditContentLabel"
><span [innerHTML]="'content.type.form.banner.message' | dm"></span
></label>
</div>
<div class="field form__group--validation">
<label dotFieldRequired for="content-type-form-name">{{ nameFieldLabel }}</label>
Expand Down
2 changes: 1 addition & 1 deletion ...dit-content/src/lib/components/dot-edit-content-form/dot-edit-content-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*ngFor="let field of column.fields"
[field]="field"
[contentlet]="formData.contentlet"
[contentType]="formData.contentType"
[contentType]="formData.contentType.variable"
data-testId="field" />
</div>
</div>
Expand Down
4 changes: 4 additions & 0 deletions ...-content/src/lib/components/dot-edit-content-form/dot-edit-content-form.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ describe('DotFormComponent', () => {
const fields = spectator.queryAll(DotEditContentFieldComponent);
JUST_FIELDS_MOCKS.forEach((field, index) => {
expect(fields[index].field).toEqual(field);
expect(fields[index].contentType).toEqual(
CONTENT_FORM_DATA_MOCK.contentType.variable
);
expect(fields[index].contentlet).toEqual(CONTENT_FORM_DATA_MOCK.contentlet);
});
});

Expand Down
28 changes: 17 additions & 11 deletions dotCMS/src/main/webapp/html/portlet/ext/contentlet/view_contentlets_js_inc.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,13 +395,14 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
var permissions = data["permissions"];
var write = userHasWritePermission (data, userId)?"1":"0";
var structure_id = data["structureInode"];
var typeVariable = data["typeVariable"];

var editRef = '';

if(structure_id == '<%=calendarEventInode %>'){
editRef = " editEvent('" + inode + "','<%=user.getUserId()%>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ") ";
editRef = " editEvent('" + inode + "','<%=user.getUserId()%>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ", '" + typeVariable + "') ";
}else{
editRef = " editContentlet('" + inode + "','<%=user.getUserId()%>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ") ";
editRef = " editContentlet('" + inode + "','<%=user.getUserId()%>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ", '" + typeVariable + "') ";
}

var ref = "<a onMouseOver=\"style.cursor='pointer'\" href=\"javascript: " + editRef + "\">";
Expand Down Expand Up @@ -1930,11 +1931,12 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
var liveSt = data.live === "true" ? "1" : "0";
var workingSt = data.working === "true" ? "1" : "0";
var write = userHasWritePermission (data, userId) ? "1" : "0";
var typeVariable = data.typeVariable;

if (data.structureInode == '<%=calendarEventInode %>') {
editEvent(inode, '<%=user.getUserId()%>', '<%= referer %>', liveSt, workingSt, write);
editEvent(inode, '<%=user.getUserId()%>', '<%= referer %>', liveSt, workingSt, write, typeVariable);
}else{
editContentlet(inode, '<%=user.getUserId()%>', '<%= referer %>', liveSt, workingSt, write);
editContentlet(inode, '<%=user.getUserId()%>', '<%= referer %>', liveSt, workingSt, write, typeVariable);
}
};

Expand All @@ -1954,18 +1956,19 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
const contentStructureType = data["contentStructureType"];
const structure_id = data["structureInode"];
const hasLiveVersion = data["hasLiveVersion"];
const typeVariable = data.typeVariable;

const contentAdmin = new dotcms.dijit.contentlet.ContentAdmin(data.identifier, data.inode, data.languageId);
const wfActionMapList = JSON.parse(data["wfActionMapList"]);

if ((live || working) && (read=="1") && (!deleted)) {
if(structure_id == '<%=calendarEventInode %>'){
actions.push({ label: write === '1' ? '<%=LanguageUtil.get(pageContext, "Edit") %>' : '<%=LanguageUtil.get(pageContext, "View") %>',
action: () => { editEvent(data.inode, '<%= user.getUserId() %>', '<%= referer %>', liveSt, workingSt, write)}
action: () => { editEvent(data.inode, '<%= user.getUserId() %>', '<%= referer %>', liveSt, workingSt, write, typeVariable)}
});
} else {
actions.push({ label: write === '1' ? '<%=LanguageUtil.get(pageContext, "Edit") %>' : '<%=LanguageUtil.get(pageContext, "View") %>',
action: () => { editContentlet(data.inode, '<%= user.getUserId() %>', '<%= referer %>', liveSt, workingSt, write)}
action: () => { editContentlet(data.inode, '<%= user.getUserId() %>', '<%= referer %>', liveSt, workingSt, write, typeVariable)}
});
}
}
Expand Down Expand Up @@ -2086,6 +2089,7 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
var wfActionMapList;
var structure_id;
var contentStructureType;
var typeVariable;

cbContentInodeList = data;

Expand Down Expand Up @@ -2130,15 +2134,17 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
write = userHasWritePermission (cellData, userId)?"1":"0";
publish = userHasPublishPermission (cellData, userId)?"1":"0";
contentStructureType = cellData["contentStructureType"];
typeVariable = cellData["typeVariable"];
structure_id = cellData["structureInode"];
hasLiveVersion = cellData["hasLiveVersion"];
holderDiv.setAttribute('data-inode', cellData["inode"]);
holderDiv.setAttribute('data-live', liveSt);
holderDiv.setAttribute('data-working', workingSt);
holderDiv.setAttribute('data-write', write);
holderDiv.setAttribute('data-typevariable', typeVariable);
holderDiv.addEventListener('click', function(e){
let dataSet = e.currentTarget.dataset;
editContentlet(dataSet["inode"],'<%= user.getUserId() %>','<%= referer %>', dataSet["live"] , dataSet["working"] , dataSet["write"] );
editContentlet(dataSet["inode"],'<%= user.getUserId() %>','<%= referer %>', dataSet["live"] , dataSet["working"] , dataSet["write"], dataSet["typevariable"] );
}, false);


Expand Down Expand Up @@ -2233,15 +2239,15 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
if ((live || working) && (read=="1") && (!deleted)) {
if(structure_id == '<%=calendarEventInode %>'){
if (write=="1"){
popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editEvent('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ");\"><%=LanguageUtil.get(pageContext, "Edit") %></div>";
popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editEvent('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ",'" + typeVariable + "');\"><%=LanguageUtil.get(pageContext, "Edit") %></div>";
}else{
popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editEvent('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ");\"><%=LanguageUtil.get(pageContext, "View") %></div>";
popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editEvent('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ",'" + typeVariable + "');\"><%=LanguageUtil.get(pageContext, "View") %></div>";
}
}else{
if (write=="1"){
popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editContentlet('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ");\"><%=LanguageUtil.get(pageContext, "Edit") %></div>";
popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editContentlet('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ",'" + typeVariable + "');\"><%=LanguageUtil.get(pageContext, "Edit") %></div>";
}else{
popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editContentlet('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ");\"><%=LanguageUtil.get(pageContext, "View") %></div>";
popupMenuItems += "<div dojoType=\"dijit.MenuItem\" iconClass=\"editIcon\" onClick=\"editContentlet('" + cellData.inode + "','<%= user.getUserId() %>','<%= referer %>'," + liveSt + "," + workingSt + "," + write + ",'" + typeVariable + "');\"><%=LanguageUtil.get(pageContext, "View") %></div>";
}
}
}
Expand Down
Loading