Fixtures update. Settings page update

andchir · Nov 18, 2018 · 0a8cd78 · 0a8cd78
1 parent 88df798
commit 0a8cd78
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 6 deletions.
diff --git a/frontend/src/app/settings/templates/settings.component.html b/frontend/src/app/settings/templates/settings.component.html
@@ -20,11 +20,6 @@ <h3>
                     <button class="dropdown-item" (click)="clearSystemCache()">{{'CLEAR_SYSTEM_CACHE' | translate}}</button>
                 </div>
             </div>
-            <a class="btn btn-secondary btn-sm ml-md-2 d-block d-md-inline-block width-100 width-md-auto" href="{{baseUrl}}admin/_console" target="_blank">
-                <i class="icon-terminal"></i>
-                &nbsp;
-                <span>{{'CONSOLE' | translate}}</span>
-            </a>
         </div>
 
         <div class="clearfix"></div>

diff --git a/src/App/DataFixtures/MongoDB/en/CatalogFixtures.php b/src/App/DataFixtures/MongoDB/en/CatalogFixtures.php
@@ -282,6 +282,26 @@ public function loadContentTypes(ObjectManager $manager) {
                 'filterOrder' => 5,
                 'listOrder' => 1
             ],
+            [
+                'title' => 'Vendor code',
+                'name' => 'vendorCode',
+                'description' => '',
+                'inputType' => 'text',
+                'inputProperties' => [
+                    'value' => '',
+                    'handler' => ''
+                ],
+                'outputType' => 'text',
+                'outputProperties' => [
+                    'className' => ''
+                ],
+                'group' => 'Options',
+                'required' => false,
+                'showInTable' => false,
+                'showInList' => false,
+                'isFilter' => false,
+                'filterOrder' => 5
+            ],
             [
                 'title' => 'Parameters',
                 'name' => 'parameters',

diff --git a/src/App/DataFixtures/MongoDB/ru/CatalogFixtures.php b/src/App/DataFixtures/MongoDB/ru/CatalogFixtures.php
@@ -282,6 +282,26 @@ public function loadContentTypes(ObjectManager $manager) {
                 'filterOrder' => 5,
                 'listOrder' => 1
             ],
+            [
+                'title' => 'Артикул',
+                'name' => 'vendorCode',
+                'description' => '',
+                'inputType' => 'text',
+                'inputProperties' => [
+                    'value' => '',
+                    'handler' => ''
+                ],
+                'outputType' => 'text',
+                'outputProperties' => [
+                    'className' => ''
+                ],
+                'group' => 'Параметры',
+                'required' => false,
+                'showInTable' => false,
+                'showInList' => false,
+                'isFilter' => false,
+                'filterOrder' => 5
+            ],
             [
                 'title' => 'Параметры',
                 'name' => 'parameters',

diff --git a/templates/header.html.twig b/templates/header.html.twig
@@ -10,7 +10,7 @@
             <div class="d-inline-block pt-2 pb-2 pl-2">
                 {% if is_granted('ROLE_USER') %}
                     {% if is_granted('ROLE_ADMIN') %}
-                        <a class="btn btn-sm btn-outline-primary" data-toggle="tooltip" title="{{ 'Administration' | trans }}" href="{{ path('admin') }}" target="_blank">
+                        <a class="btn btn-sm btn-outline-primary" data-toggle="tooltip" title="{{ 'Administration' | trans }}" href="{{ path('admin') }}">
                             <i class="icon-cog"></i>
                         </a>
                     {% endif %}