Commit a15cc9f

committed

Merge branch 'fix-config-options'

2 parents aee5cb0 + 066eafa commit a15cc9fCopy full SHA for a15cc9f

File tree

2 files changed

+12

-22

lines changed

src/Enqueue/Enqueue
- Helper
  - Data.php
- etc
  - system.xml

2 files changed

+12

-22

lines changed

`‎src/Enqueue/Enqueue/Helper/Data.php‎`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -130,11 +130,10 @@ public function getRabbitMqAmqpConfig()`
`130`	`130`	`return ['rabbitmq_amqp' => [`
`131`	`131`	`'host' => Mage::getStoreConfig('enqueue/rabbitmq_amqp/host'),`
`132`	`132`	`'port' => (int) Mage::getStoreConfig('enqueue/rabbitmq_amqp/port'),`
`133`		`- 'login' => Mage::getStoreConfig('enqueue/rabbitmq_amqp/login'),`
`134`		`- 'password' => Mage::getStoreConfig('enqueue/rabbitmq_amqp/password'),`
	`133`	`+ 'user' => Mage::getStoreConfig('enqueue/rabbitmq_amqp/user'),`
	`134`	`+ 'pass' => Mage::getStoreConfig('enqueue/rabbitmq_amqp/pass'),`
`135`	`135`	`'vhost' => Mage::getStoreConfig('enqueue/rabbitmq_amqp/vhost'),`
`136`	`136`	`'lazy' => (bool) Mage::getStoreConfig('enqueue/rabbitmq_amqp/lazy'),`
`137`		`- 'delay_plugin_installed' => (bool) Mage::getStoreConfig('enqueue/rabbitmq_amqp/delay_plugin_installed'),`
`138`	`137`	`]];`
`139`	`138`	`}`
`140`	`139`

`‎src/Enqueue/Enqueue/etc/system.xml‎`

Lines changed: 10 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -123,22 +123,22 @@`
`123`	`123`	`<show_in_store>-</show_in_store>`
`124`	`124`	`<validate>validate-number</validate>`
`125`	`125`	`</port>`
`126`		`- <login translate="label">`
`127`		`- <label>Login</label>`
	`126`	`+ <user translate="label">`
	`127`	`+ <label>User</label>`
`128`	`128`	`<frontend_type>text</frontend_type>`
`129`	`129`	`<sort_order>3</sort_order>`
`130`	`130`	`<show_in_default>1</show_in_default>`
`131`	`131`	`<show_in_website>0</show_in_website>`
`132`	`132`	`<show_in_store>-</show_in_store>`
`133`		`- </login>`
`134`		`- <password translate="label">`
	`133`	`+ </user>`
	`134`	`+ <pass translate="label">`
`135`	`135`	`<label>Password</label>`
`136`	`136`	`<frontend_type>text</frontend_type>`
`137`	`137`	`<sort_order>4</sort_order>`
`138`	`138`	`<show_in_default>1</show_in_default>`
`139`	`139`	`<show_in_website>0</show_in_website>`
`140`	`140`	`<show_in_store>-</show_in_store>`
`141`		`- </password>`
	`141`	`+ </pass>`
`142`	`142`	`<vhost translate="label">`
`143`	`143`	`<label>Virtual Host</label>`
`144`	`144`	`<frontend_type>text</frontend_type>`
`@@ -157,15 +157,6 @@`
`157`	`157`	`<show_in_store>-</show_in_store>`
`158`	`158`	`<comment>Connection will be performed as later as possible.</comment>`
`159`	`159`	`</lazy>`
`160`		`- <delay_plugin_installed translate="label">`
`161`		`- <label>Delay plugin installed</label>`
`162`		`- <frontend_type>select</frontend_type>`
`163`		`- <source_model>adminhtml/system_config_source_yesno</source_model>`
`164`		`- <sort_order>7</sort_order>`
`165`		`- <show_in_default>1</show_in_default>`
`166`		`- <show_in_website>0</show_in_website>`
`167`		`- <show_in_store>-</show_in_store>`
`168`		`- </delay_plugin_installed>`
`169`	`160`	`</fields>`
`170`	`161`	`</rabbitmq_amqp>`
`171`	`162`	`<amqp translate="label">`
`@@ -194,22 +185,22 @@`
`194`	`185`	`<show_in_store>-</show_in_store>`
`195`	`186`	`<validate>validate-number</validate>`
`196`	`187`	`</port>`
`197`		`- <login translate="label">`
`198`		`- <label>Login</label>`
	`188`	`+ <user translate="label">`
	`189`	`+ <label>User</label>`
`199`	`190`	`<frontend_type>text</frontend_type>`
`200`	`191`	`<sort_order>3</sort_order>`
`201`	`192`	`<show_in_default>1</show_in_default>`
`202`	`193`	`<show_in_website>0</show_in_website>`
`203`	`194`	`<show_in_store>-</show_in_store>`
`204`		`- </login>`
`205`		`- <password translate="label">`
	`195`	`+ </user>`
	`196`	`+ <pass translate="label">`
`206`	`197`	`<label>Password</label>`
`207`	`198`	`<frontend_type>text</frontend_type>`
`208`	`199`	`<sort_order>4</sort_order>`
`209`	`200`	`<show_in_default>1</show_in_default>`
`210`	`201`	`<show_in_website>0</show_in_website>`
`211`	`202`	`<show_in_store>-</show_in_store>`
`212`		`- </password>`
	`203`	`+ </pass>`
`213`	`204`	`<vhost translate="label">`
`214`	`205`	`<label>Virtual Host</label>`
`215`	`206`	`<frontend_type>text</frontend_type>`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a15cc9f

File tree

2 files changed

2 files changed

`‎src/Enqueue/Enqueue/Helper/Data.php‎`

`‎src/Enqueue/Enqueue/etc/system.xml‎`

0 commit comments