@wilsonge with the new switcher class added in the XML files, is this going to be a pita with conflicts when merging into J4?

@wilsonge with the new switcher class and options switched round in the XML files, is this going to be a pita with conflicts when merging into J4?

Perhaps making the pr against the J4 branch then?

Perhaps making the pr against the J4 branch then?

That will be the exact same pita ?
Maybe better revert the stupid change with the switcher class and options switched around in J4 sigh

I can deal with the conflicts. Everyone can stop stressing - it's the result of having two versions being dev'd at the same time.

I have tested this item ✅ successfully on 51cff1e

code review.

@wilsonge - Fair enough.

@Bakual - So you said before. Submit a PR if you're not happy

conflicts resolved

@Quy don't know how I missed those. Thanks I will update the pr tonight

Reformat:

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/config.xml#L704-L705

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/config.xml#L803-L808

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/config.xml#L820-L821

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/config.xml#L960-L971

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/config.xml#L1074-L1079

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/config.xml#L1122

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/models/forms/article.xml#L115

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/models/forms/article.xml#L147-L149

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/models/forms/article.xml#L171

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/models/forms/article.xml#L191

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/models/forms/article.xml#L270

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/models/forms/article.xml#L273

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/models/forms/article.xml#L315-L316

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/models/forms/article.xml#L591-L593

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/models/forms/article.xml#L604-L606

https://github.com/brianteeman/joomla-cms/blob/9439564d26eb5ad2bbc3c8dc094ee599afd7bb0a/administrator/components/com_content/models/forms/article.xml#L1041-L1042

@Quy looks like you submitted a PR for this ?

No. I submitted for the front end. This for the admin/back end.

@Quy ok - I will do it - in future please comment inline on the code as this is very hard to follow

@Quy did them all - note the small fields can be on one line according to the styleguide but I split them for consistency

@brianteeman In 55885fc#diff-a32575625c5697f057b165403b713857 you made some changes like deleting line 9 to 11, yet going here https://github.com/brianteeman/joomla-cms/blob/xml-code-admin-components/administrator/components/com_media/config.xml , it appears they are back. Do you know why?

resolving merge conflicts perhaps?

http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail
Virus-free.
www.avg.com
http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail
<#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>

On 27 May 2017 at 22:00, Quy notifications@github.com wrote:

@brianteeman https://github.com/brianteeman In 55885fc#diff-
a32575625c5697f057b165403b713857
55885fc#diff-a32575625c5697f057b165403b713857
you made some changes like deleting line 9 to 11, yet going here
https://github.com/brianteeman/joomla-cms/blob/xml-code-admin-components/
administrator/components/com_media/config.xml , it appears they are back.
Do you know why?

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#15920 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/ABPH8WcXQyvUtEhbvzLIi1XW1snXRuDWks5r-I7_gaJpZM4NVtm7
.

--
Brian Teeman
Co-founder Joomla! and OpenSourceMatters Inc.
https://brian.teeman.net/ http://brian.teeman.net/

Should I proceed with redoing the changes you did?

i just did it

@Quy thanks for everything on this - seems I didnt do a good job

I have tested this item ✅ successfully on 6cdfb9e

@brianteeman Thank you!

@andrepereiradasilva made some of your changes and commented on two other requests

I have tested this item ✅ successfully on 6cdfb9e

I have tested this item ✅ successfully on 6cdfb9e

Code review

RTC please

RTC after two successful tests.

Thankyou very much!

Thanks everyone