partkeepr

commit 3f518eadb17bcf85e984f02464a27d6e0340d939
parent f494a539a2ab2404136bee16cbc909b9594a6474
Author: Timo A. Hummel <felicitus@felicitus.org>
Date:   Fri, 11 Mar 2016 12:30:06 +0100

Merge pull request #610 from partkeepr/PartKeepr-574

Part keepr 574
Diffstat:
M
src/PartKeepr/CoreBundle/DoctrineMigrations/Version20151208162723.php
 | 
2
+-
M
src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartEditor.js
 | 
8
--------

2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/PartKeepr/CoreBundle/DoctrineMigrations/Version20151208162723.php b/src/PartKeepr/CoreBundle/DoctrineMigrations/Version20151208162723.php
@@ -15,7 +15,7 @@ class Version20151208162723 extends BaseMigration
     public function up(Schema $schema)
     {
         $this->performDatabaseUpgrade();
-        $activeUsersSQL = "UPDATE PartKeeprUser SET active = 1";
+        $activeUsersSQL = "UPDATE PartKeeprUser SET active = true";
         $this->addSql($activeUsersSQL);
     }
 
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartEditor.js b/src/PartKeepr/FrontendBundle/Resources/public/js/Components/Part/Editor/PartEditor.js
@@ -200,13 +200,6 @@ Ext.define('PartKeepr.PartEditor', {
             layout: 'fit'
         });
 
-        // Creates the parameter grid
-        this.partParameterGrid = Ext.create("PartKeepr.PartParameterGrid", {
-            title: i18n("Parameters"),
-            iconCls: 'web-icon table',
-            layout: 'fit'
-        });
-
         // Creates the attachment grid
         this.partAttachmentGrid = Ext.create("PartKeepr.PartAttachmentGrid", {
             title: i18n("Attachments"),
@@ -283,7 +276,6 @@ Ext.define('PartKeepr.PartEditor', {
                 },
                 this.partDistributorGrid,
                 this.partManufacturerGrid,
-                this.partParameterGrid,
                 this.partAttachmentGrid
             ]
         };