Skip to content

Commit

Permalink
Merge branch '2.0' into jms-pimcore-object-serializer
Browse files Browse the repository at this point in the history
  • Loading branch information
dpfaffenbauer authored Jan 11, 2019
2 parents 015baae + e3699a1 commit 8a68c90
Showing 1 changed file with 2 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,8 @@ coreshop.core.resource = Class.create(coreshop.resource, {
Ext.get('pimcore_menu_coreshop').on('mousedown', function (e, el) {
toolbar.showSubMenu.call(this._menu, e, el);
}.bind(this));

coreshop.broker.fireEvent('coreShop.menu.initialized', this, this._menu);
}

Ext.get('coreshop_status').set(
Expand All @@ -424,10 +426,6 @@ coreshop.core.resource = Class.create(coreshop.resource, {

pimcore.helpers.initMenuTooltips();

$(document).trigger('coreShopReady');

//coreshop.plugin.broker.fireEvent('coreshopReady', this);

//Add Report Definition
pimcore.report.broker.addGroup('coreshop', 'coreshop_reports', 'coreshop_icon_report');
//pimcore.report.broker.addGroup('coreshop_monitoring', 'coreshop_monitoring', 'coreshop_icon_monitoring');
Expand Down

0 comments on commit 8a68c90

Please sign in to comment.