Merge branch 'MAGNSWTCH-88' into 'master'

Vadim Zubovich · Vadim Zubovich · commit d8e7cac180a3 · 2015-06-17T20:36:29.000+03:00
Magnswtch 88

See merge request !14
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
@@ -70,6 +70,8 @@ protected function _prepareForm()
         }
         $this->_coreRegistry->register('attribute_type_hidden_fields', $_hiddenFields);
 
+        $this->_eventManager->dispatch('product_attribute_form_build_main_tab', ['form' => $form]);
+
         $frontendInputValues = array_merge($frontendInputElm->getValues(), $additionalTypes);
         $frontendInputElm->setValues($frontendInputValues);
 

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,8 @@ protected function _prepareForm()`
`70`	`70`	`}`
`71`	`71`	`$this->_coreRegistry->register('attribute_type_hidden_fields', $_hiddenFields);`
`72`	`72`
	`73`	`+ $this->_eventManager->dispatch('product_attribute_form_build_main_tab', ['form' => $form]);`
	`74`	`+`
`73`	`75`	`$frontendInputValues = array_merge($frontendInputElm->getValues(), $additionalTypes);`
`74`	`76`	`$frontendInputElm->setValues($frontendInputValues);`
`75`	`77`