Merge pull request #14 from magium/develop

Merging
magium · Jan 5, 2017 · 6feb516 · 6feb516
2 parents c49e70e + 0669e26
commit 6feb516
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/app/code/community/Magium/Clairvoyant/controllers/Magiumui/ExecutionController.php b/app/code/community/Magium/Clairvoyant/controllers/Magiumui/ExecutionController.php
@@ -35,7 +35,7 @@ public function assignAction()
                 $model->save();
                 Mage::getSingleton('adminhtml/session')->addSuccess(
                     Mage::helper('magium_clairvoyant')->__(
-                        'Test has been attiached to event: %s',
+                        'Test has been attached to event: %s',
                         $this->getRequest()->getParam('event')
                     )
                 );

diff --git a/app/code/community/Magium/Clairvoyant/sql/magium_clairvoyant_setup/install-1.0.0.php b/app/code/community/Magium/Clairvoyant/sql/magium_clairvoyant_setup/install-1.0.0.php
@@ -276,7 +276,6 @@
             ), 'Value')
         ->addColumn('test_id', Varien_Db_Ddl_Table::TYPE_INTEGER, null,
             array(
-                'nullable' => false,
             ), 'Test ID')
         ->addColumn('actions_serialized', Varien_Db_Ddl_Table::TYPE_TEXT, null,
             array(
@@ -307,8 +306,8 @@
             'test_id',
             $installer->getTable('magium_clairvoyant/test'),
             'entity_id',
-            Varien_Db_Ddl_Table::ACTION_NO_ACTION,
-            Varien_Db_Ddl_Table::ACTION_NO_ACTION
+            Varien_Db_Ddl_Table::ACTION_SET_NULL,
+            Varien_Db_Ddl_Table::ACTION_SET_NULL
         )
         ->setComment('Magium Test Runs');
     $installer->getConnection()->createTable($table);

diff --git a/modman b/modman
@@ -0,0 +1,9 @@
+# app/code
+app/code/community/Magium/Clairvoyant            app/code/community/Magium/Clairvoyant
+# app/etc
+app/etc/modules/Magium_Clairvoyant.xml            app/etc/modules/Magium_Clairvoyant.xml
+# app/design
+app/design/adminhtml/default/default/layout/magium/clairvoyant.xml            app/design/adminhtml/default/default/layout/magium/clairvoyant.xml
+app/design/adminhtml/default/default/template/magium/management.phtml            app/design/adminhtml/default/default/template/magium/management.phtml
+app/design/adminhtml/default/default/template/magium/queue/grid.phtml            app/design/adminhtml/default/default/template/magium/queue/grid.phtml
+app/design/adminhtml/default/default/template/magium/widget/form/container.phtml            app/design/adminhtml/default/default/template/magium/widget/form/container.phtml