Skip to content

Commit

Permalink
Merge pull request #32 from YouweGit/includeRawType
Browse files Browse the repository at this point in the history
Include raw type for feed overview && Fix an issue to always show feed overview when the type is Feed
  • Loading branch information
jorisros authored Oct 9, 2019
2 parents b59c098 + 0eb2be1 commit 4b9359b
Showing 1 changed file with 15 additions and 8 deletions.
23 changes: 15 additions & 8 deletions Resources/public/js/pimcore/item.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ feedbuilder.panelitem = Class.create({
var activeRadio = null;
for(var i =0; i<item.items.items.length; i++){
if(item.items.items[i].checked){

if(item.items.items[i].inputValue == 3){
if(item.items.items[i].inputValue === 3){
Ext.getCmp('feedbuilder_feed_overview-'+this.data.id).show();
}
}
Expand Down Expand Up @@ -127,8 +126,7 @@ feedbuilder.panelitem = Class.create({
value: 'jorisje',
border: false,
disabled: false,
html: '<b>Urls</b><br>JSON: <a href="'+url+'.json" target="_blank">'+url+'.json</a><br>XML: <a href="'+url+'.xml" target="_blank">'+url+'.xml</a><br>HTML: <a href="'+url+'.html" target="_blank">'+url+'.html</a>'

html: '<b>Urls</b><br>JSON: <a href="'+url+'.json" target="_blank">'+url+'.json</a><br>XML: <a href="'+url+'.xml" target="_blank">'+url+'.xml</a><br>HTML: <a href="'+url+'.html" target="_blank">'+url+'.html</a><br>RAW: <a href="'+url+'.raw" target="_blank">'+url+'.raw</a>'
});

},
Expand Down Expand Up @@ -166,7 +164,6 @@ feedbuilder.panelitem = Class.create({
);
},
getPathField: function() {

if(!this.data.configuration.path){
this.data.configuration.path = '/';
}
Expand Down Expand Up @@ -256,6 +253,7 @@ feedbuilder.panelitem = Class.create({
},
addLayout: function() {
var panelButtons = [];
var hideOverview = true;
panelButtons.push('->',{
text: t("delete"),
iconCls: "pimcore_icon_delete",
Expand Down Expand Up @@ -293,7 +291,17 @@ feedbuilder.panelitem = Class.create({
this.parentPanel.getEditPanel().add(this.panel);
this.parentPanel.getEditPanel().setActiveTab(this.panel);

Ext.getCmp('feedbuilder_feed_overview-'+this.data.id).hide();
if (this.data.configuration && this.data.configuration.type && Array.isArray(this.data.configuration.type)) {
this.data.configuration.type.forEach(function (item) {
if (item.boxLabel === 'Feed' && item.checked === true) {
hideOverview = false;
}
});
}

if (hideOverview === true) {
Ext.getCmp('feedbuilder_feed_overview-' + this.data.id).hide();
}

pimcore.layout.refresh();
},
Expand Down Expand Up @@ -343,5 +351,4 @@ feedbuilder.panelitem = Class.create({

pimcore.helpers.showNotification(t("delete"), t("feedbuilder_delete_successfully"), "delete");
}

});
});

0 comments on commit 4b9359b

Please sign in to comment.