Commit 1ec9b58f authored by Felix Herrmann's avatar Felix Herrmann
Browse files

Merge branch 'diff-state' into 'master'

Diff state

See merge request shopware/plugins/RicoDynamicFAQ!10
parents 278f6215 cb5d0ead
......@@ -5,8 +5,6 @@ Ext.define('Shopware.apps.Faq.controller.Main', {
me.handleStore(me);
window.console.log(me.subApplication.categoryStore);
me.mainWindow = me.getView('main.Window').create({
questionStore: me.subApplication.questionStore,
categoryStore: me.subApplication.categoryStore
......
......@@ -24,8 +24,6 @@ Ext.define('Shopware.apps.Faq.view.main.Window', {
me.registerEvents();
window.console.log(me);
me.tabPanel = Ext.create('Ext.tab.Panel', {
items: me.getTabs(),
split: false,
......
......@@ -51,4 +51,4 @@
<br />
<a href="{url controller='faq' action='new'}" class="btn is--primary">{s name='NewQuestionCTAText'}{/s}</a>
{/block}
{/block}
\ No newline at end of file
{/block}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment