Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.1' into 1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@robertSt7
robertSt7 committed Sep 14, 2023
2 parents ba6a4c1 + 9ab8863 commit c4b0b48
Show file tree
Hide file tree
Showing 38 changed files with 1,103 additions and 272 deletions.
10 changes: 4 additions & 6 deletions public/css/admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1567,11 +1567,13 @@ span.warning {
opacity: 1;
}

.pimcore_editor_tabbar .x-tab.x-tab-active .x-tab-inner-default {
.pimcore_editor_tabbar .x-tab.x-tab-active .x-tab-inner-default,
.pimcore_editor_tabbar .x-tab.x-tab-over .x-tab-inner-default {
color: #000 !important;
}

.pimcore_editor_tabbar .x-tab.x-tab-active .pimcore_material_icon {
.pimcore_editor_tabbar .x-tab.x-tab-active .pimcore_material_icon,
.pimcore_editor_tabbar .x-tab.x-tab-over .pimcore_material_icon {
filter: invert(100%);
}

Expand All @@ -1582,10 +1584,6 @@ span.warning {
opacity: 1;
}

.pimcore_editor_tabbar .x-tab.x-tab-over .x-tab-inner-default {
color: #fff;
}

.pimcore_editor_tabbar .x-tab-bar-strip-default {
border-bottom: 0;
}
Expand Down
18 changes: 10 additions & 8 deletions public/js/pimcore/asset/tree.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@

onTreeNodeClick: function (tree, record, item, index, event, eOpts ) {
if (event.ctrlKey === false && event.shiftKey === false && event.altKey === false) {
if (record.data.permissions.view) {
if (record.data.permissions && record.data.permissions.view) {
pimcore.helpers.treeNodeThumbnailPreviewHide();
pimcore.helpers.openAsset(record.data.id, record.data.type);
}
Expand Down Expand Up @@ -633,8 +633,8 @@

}
}
if (record.data.permissions.rename && record.data.id != 1 && !record.data.locked) {

if (record.data.permissions && record.data.permissions.rename && record.data.id != 1 && !record.data.locked) {
if (perspectiveCfg.inTreeContextMenu("asset.rename")) {
menu.add(new Ext.menu.Item({
text: t('rename'),
Expand All @@ -644,7 +644,7 @@
}
}

if (this.id != 1 && record.data.permissions.view) {
if (this.id != 1 && record.data.permissions && record.data.permissions.view) {
if (perspectiveCfg.inTreeContextMenu("asset.copy")) {
menu.add(new Ext.menu.Item({
text: t('copy'),
Expand All @@ -655,7 +655,7 @@
}

//cut
if (record.data.id != 1 && !record.data.locked && record.data.permissions.rename) {
if (record.data.id != 1 && !record.data.locked && record.data.permissions && record.data.permissions.rename) {
if (perspectiveCfg.inTreeContextMenu("asset.cut")) {
menu.add(new Ext.menu.Item({
text: t('cut'),
Expand All @@ -668,6 +668,7 @@

//paste
if (pimcore.cachedAssetId
&& record.data.permissions
&& (record.data.permissions.create || record.data.permissions.publish)
&& perspectiveCfg.inTreeContextMenu("asset.paste")) {

Expand All @@ -687,6 +688,7 @@
}

if (record.data.type == "folder" && pimcore.cutAsset
&& record.data.permissions
&& (record.data.permissions.create || record.data.permissions.publish)
&& perspectiveCfg.inTreeContextMenu("asset.pasteCut")) {
menu.add(new Ext.menu.Item({
Expand All @@ -701,7 +703,7 @@
}));
}

if (record.data.permissions.remove && record.data.id != 1 && !record.data.locked && perspectiveCfg.inTreeContextMenu("asset.delete")) {
if (record.data.permissions && record.data.permissions.remove && record.data.id != 1 && !record.data.locked && perspectiveCfg.inTreeContextMenu("asset.delete")) {
menu.add(new Ext.menu.Item({
text: t('delete'),
iconCls: "pimcore_icon_delete",
Expand All @@ -710,7 +712,7 @@
}

// upload & download
if (record.data.permissions.view) {
if (record.data.permissions && record.data.permissions.view) {
menu.add("-");

if (record.data.type == "folder") {
Expand Down Expand Up @@ -748,7 +750,7 @@
var advancedMenuItems = [];
var user = pimcore.globalmanager.get("user");

if (record.data.permissions.create &&
if (record.data.permissions && record.data.permissions.create &&
!record.data.locked &&
perspectiveCfg.inTreeContextMenu("asset.searchAndMove") &&
pimcore.helpers.hasSearchImplementation()) {
Expand Down
32 changes: 17 additions & 15 deletions public/js/pimcore/document/tree.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ pimcore.document.tree = Class.create({

var itemsPerPage = pimcore.settings['document_tree_paging_limit'];


let rootNodeConfigText = t('home');
let rootNodeConfigIconCls = "pimcore_icon_home";
if(this.config.customViewId !== undefined && rootNodeConfig.id !== 1) {
Expand Down Expand Up @@ -210,7 +211,7 @@ pimcore.document.tree = Class.create({

onTreeNodeClick: function (tree, record, item, index, event, eOpts ) {
if (event.ctrlKey === false && event.shiftKey === false && event.altKey === false) {
if (record.data.permissions.view) {
if (record.data.permissions && record.data.permissions.view) {
pimcore.helpers.treeNodeThumbnailPreviewHide();
pimcore.helpers.openDocument(record.data.id, record.data.type);
}
Expand Down Expand Up @@ -349,7 +350,7 @@ pimcore.document.tree = Class.create({
selectedIds.push(item.id);
});

if (record.data.permissions.remove && record.data.id != 1 && !record.data.locked && perspectiveCfg.inTreeContextMenu("document.delete")) {
if (record.data.permissions && record.data.permissions.remove && record.data.id != 1 && !record.data.locked && perspectiveCfg.inTreeContextMenu("document.delete")) {
menu.add(new Ext.menu.Item({
text: t('delete'),
iconCls: "pimcore_icon_delete",
Expand All @@ -359,8 +360,8 @@ pimcore.document.tree = Class.create({
} else {
var pasteMenu = [];
var pasteInheritanceMenu = [];
var childSupportedDocument = pimcore.helpers.documentTypeHasSpecificRole(record.data.type, "children_supported");
if (childSupportedDocument && record.data.permissions.create) {
var childSupportedDocument = (record.data.type)?pimcore.helpers.documentTypeHasSpecificRole(record.data.type, "children_supported"):false;
if (childSupportedDocument && record.data.permissions && record.data.permissions.create) {


var addDocuments = perspectiveCfg.inTreeContextMenu("document.add");
Expand Down Expand Up @@ -470,7 +471,7 @@ pimcore.document.tree = Class.create({


//paste
if (pimcore.cachedDocumentId && record.data.permissions.create && perspectiveCfg.inTreeContextMenu("document.paste")) {
if (pimcore.cachedDocumentId && record.data.permissions && record.data.permissions.create && perspectiveCfg.inTreeContextMenu("document.paste")) {
pasteMenu.push({
text: t("paste_recursive_as_child"),
iconCls: "pimcore_icon_paste",
Expand Down Expand Up @@ -543,7 +544,7 @@ pimcore.document.tree = Class.create({


//paste
if (childSupportedDocument && pimcore.cutDocument && record.data.permissions.create && perspectiveCfg.inTreeContextMenu("document.pasteCut")) {
if (childSupportedDocument && pimcore.cutDocument && record.data.permissions && record.data.permissions.create && perspectiveCfg.inTreeContextMenu("document.pasteCut")) {
pasteMenu.push({
text: t("paste_cut_element"),
iconCls: "pimcore_icon_paste",
Expand All @@ -556,7 +557,7 @@ pimcore.document.tree = Class.create({
});
}

if (pimcore.cachedDocumentId && record.data.permissions.create && perspectiveCfg.inTreeContextMenu("document.paste")) {
if (pimcore.cachedDocumentId && record.data.permissions && record.data.permissions.create && perspectiveCfg.inTreeContextMenu("document.paste")) {

if (record.data.type != "folder") {
pasteMenu.push({
Expand Down Expand Up @@ -585,23 +586,23 @@ pimcore.document.tree = Class.create({
}));
}

if (record.data.permissions.view && perspectiveCfg.inTreeContextMenu("document.copy")) {
if (record.data.permissions && record.data.permissions.view && perspectiveCfg.inTreeContextMenu("document.copy")) {
menu.add(new Ext.menu.Item({
text: t('copy'),
iconCls: "pimcore_icon_copy",
handler: this.copy.bind(this, tree, record)
}));
}

if (record.data.id != 1 && !record.data.locked && record.data.permissions.rename && perspectiveCfg.inTreeContextMenu("document.cut")) {
if (record.data.id != 1 && !record.data.locked && record.data.permissions && record.data.permissions.rename && perspectiveCfg.inTreeContextMenu("document.cut")) {
menu.add(new Ext.menu.Item({
text: t('cut'),
iconCls: "pimcore_icon_cut",
handler: this.cut.bind(this, tree, record)
}));
}

if (record.data.permissions.rename && record.data.id != 1 && !record.data.locked && perspectiveCfg.inTreeContextMenu("document.rename")) {
if (record.data.permissions && record.data.permissions.rename && record.data.id != 1 && !record.data.locked && perspectiveCfg.inTreeContextMenu("document.rename")) {
menu.add(new Ext.menu.Item({
text: t('rename'),
iconCls: "pimcore_icon_key pimcore_icon_overlay_go",
Expand All @@ -611,13 +612,13 @@ pimcore.document.tree = Class.create({

//publish
if (record.data.type != "folder" && !record.data.locked) {
if (record.data.published && record.data.permissions.unpublish && perspectiveCfg.inTreeContextMenu("document.unpublish")) {
if (record.data.published && record.data.permissions && record.data.permissions.unpublish && perspectiveCfg.inTreeContextMenu("document.unpublish")) {
menu.add(new Ext.menu.Item({
text: t('unpublish'),
iconCls: "pimcore_icon_unpublish",
handler: this.publishDocument.bind(this, tree, record, 'unpublish')
}));
} else if (!record.data.published && record.data.permissions.publish && perspectiveCfg.inTreeContextMenu("document.publish")) {
} else if (!record.data.published && record.data.permissions && record.data.permissions.publish && perspectiveCfg.inTreeContextMenu("document.publish")) {
menu.add(new Ext.menu.Item({
text: t('publish'),
iconCls: "pimcore_icon_publish",
Expand All @@ -627,15 +628,15 @@ pimcore.document.tree = Class.create({
}


if (record.data.permissions.remove && record.data.id != 1 && !record.data.locked && perspectiveCfg.inTreeContextMenu("document.delete")) {
if (record.data.permissions && record.data.permissions.remove && record.data.id != 1 && !record.data.locked && perspectiveCfg.inTreeContextMenu("document.delete")) {
menu.add(new Ext.menu.Item({
text: t('delete'),
iconCls: "pimcore_icon_delete",
handler: this.deleteDocument.bind(this, record.data.id)
}));
}

if ((record.data.type == "page" || record.data.type == "hardlink") && record.data.permissions.view && perspectiveCfg.inTreeContextMenu("document.open")) {
if ((record.data.type == "page" || record.data.type == "hardlink") && record.data.permissions && record.data.permissions.view && perspectiveCfg.inTreeContextMenu("document.open")) {
menu.add(new Ext.menu.Item({
text: t('open_in_new_window'),
iconCls: "pimcore_icon_open_window",
Expand All @@ -649,7 +650,7 @@ pimcore.document.tree = Class.create({
var advancedMenuItems = [];
var user = pimcore.globalmanager.get("user");

if (record.data.id != 1 && record.data.permissions.publish && !record.data.locked && perspectiveCfg.inTreeContextMenu("document.convert")) {
if (record.data.id != 1 && record.data.permissions && record.data.permissions.publish && !record.data.locked && perspectiveCfg.inTreeContextMenu("document.convert")) {

let conversionTargets = [];
if(addDocuments) {
Expand Down Expand Up @@ -704,6 +705,7 @@ pimcore.document.tree = Class.create({
}

if (childSupportedDocument &&
record.data.permissions &&
record.data.permissions.create &&
perspectiveCfg.inTreeContextMenu("document.searchAndMove") &&
pimcore.helpers.hasSearchImplementation()) {
Expand Down
48 changes: 28 additions & 20 deletions public/js/pimcore/elementservice.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,20 +439,22 @@ pimcore.elementservice.editDocumentKeyComplete = function (options, button, val

for (index = 0; index < affectedNodes.length; index++) {
record = affectedNodes[index];
pimcore.elementservice.refreshNode(record.parentNode);
pimcore.elementservice.refreshNode(record);
}

if (pimcore.globalmanager.exists("document_" + id)) {
try {
if (rdata && rdata.success) {
pimcore.elementservice.reopenElement(options);
} else {
pimcore.helpers.showNotification(t("error"), t("error_renaming_item"), "error",
t(rdata.message));
try {
if (rdata && rdata.success) {
if (rdata.treeData) {
pimcore.helpers.updateTreeElementStyle('document', id, rdata.treeData);
}
} catch (e) {
pimcore.helpers.showNotification(t("error"), t("error_renaming_item"), "error");

pimcore.elementservice.reopenElement(options);
} else {
pimcore.helpers.showNotification(t("error"), t("error_renaming_item"), "error",
t(rdata.message));
}
} catch (e) {
pimcore.helpers.showNotification(t("error"), t("error_renaming_item"), "error");
}
}.bind(this));
}
Expand Down Expand Up @@ -496,6 +498,10 @@ pimcore.elementservice.editObjectKeyComplete = function (options, button, value,
try {
var rdata = Ext.decode(response.responseText);
if (rdata && rdata.success) {
if (rdata.treeData) {
pimcore.helpers.updateTreeElementStyle('object', id, rdata.treeData);
}

pimcore.elementservice.reopenElement(options);
// removes loading indicator added in the applyNewKey method
pimcore.helpers.removeTreeNodeLoadingIndicator(elementType, id);
Expand Down Expand Up @@ -587,7 +593,7 @@ pimcore.elementservice.editAssetKeyComplete = function (options, button, value,
return;
}

if(rdata && rdata.success) {
if (rdata && rdata.success) {
// removes loading indicator added in the applyNewKey method
pimcore.helpers.removeTreeNodeLoadingIndicator(elementType, id);
}
Expand All @@ -597,18 +603,20 @@ pimcore.elementservice.editAssetKeyComplete = function (options, button, value,
pimcore.elementservice.refreshNode(record);
}

if (pimcore.globalmanager.exists("asset_" + id)) {
try {
if (rdata && rdata.success) {
pimcore.elementservice.reopenElement(options);
} else {
pimcore.helpers.showNotification(t("error"), t("error_renaming_item"),
"error", t(rdata.message));
try {
if (rdata && rdata.success) {
if (rdata.treeData) {
pimcore.helpers.updateTreeElementStyle('asset', id, rdata.treeData);
}
} catch (e) {

pimcore.elementservice.reopenElement(options);
} else {
pimcore.helpers.showNotification(t("error"), t("error_renaming_item"),
"error");
"error", t(rdata.message));
}
} catch (e) {
pimcore.helpers.showNotification(t("error"), t("error_renaming_item"),
"error");
}
}.bind(this))
;
Expand Down
5 changes: 4 additions & 1 deletion public/js/pimcore/functions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1624,8 +1624,11 @@ sprintf = function ()
else if (pType == 'x') subst = ('' + parseInt(param).toString(16)).toLowerCase();
else if (pType == 'X') subst = ('' + parseInt(param).toString(16)).toUpperCase();
}
str = leftpart + subst + rightPart;
arguments[numSubstitutions] = subst;
str = leftpart + '${'+numSubstitutions+'}' + rightPart;
}
str = str.replace(/\${(\d+)}/g, (match, num) => arguments[num]);

return str;
}

Expand Down
19 changes: 15 additions & 4 deletions public/js/pimcore/helpers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,14 @@ pimcore.helpers.updateTreeElementStyle = function (type, id, treeData) {
if (typeof treeData.qtipCfg !== "undefined") {
record.set("qtipCfg", treeData.qtipCfg);
}

if (typeof treeData.key !== "undefined") {
record.set("key", treeData.key);
}

if (typeof treeData.text !== "undefined") {
record.set("text", treeData.text);
}
}
}
}
Expand Down Expand Up @@ -3037,10 +3045,12 @@ pimcore.helpers.registerAssetDnDSingleUpload = function (element, parent, parent

var params = {};

if(parentType === 'path') {
params['parentPath'] = parent;
} else if (parentType === 'id') {
params['parentId'] = parent;
if(parent !== undefined){
if(parentType === 'path') {
params['parentPath'] = parent;
} else if (parentType === 'id') {
params['parentId'] = parent;
}
}

if (context) {
Expand Down Expand Up @@ -3386,6 +3396,7 @@ pimcore.helpers.priorityCompare = function(a, b) {
}

pimcore.helpers.documentTypeHasSpecificRole = function(documentType, role) {

return pimcore.settings.document_types_configuration[documentType][role];
}

Expand Down
Loading

0 comments on commit c4b0b48

Please sign in to comment.