When editing Organization as non-omniadmin user, you get organization parent assigned to itself

• Type: Bug
• Status: Closed
• Resolution: Fixed
• Affects Version/s: 5.2.3, 5.2.9 EE, 6.0.6 GA, 6.0.11 EE
• Fix Version/s: 5.2.9 EE, 5.2.X EE, --Sprint - SP, 6.0.12 EE, 6.1.0 CE RC1
• Component/s: Legacy, Legacy > Control Panel menu, Legacy > Enterprise Admin, ~ [Archived] Sites Management
• Labels:
  • QA-R
• Environment: Tomcat, Windows, in affects versions I marked EE because I checked the trunk also has same buggy code.
• Branch Version/s:
  6.0.x, 5.2.x
• Backported to Branch:
  Committed

To reproduce:
1. create a simple user
2. assign it some organization
3. give it owner role to this organization
4. login using this user
5. go to Control panel -> Organizations
6. click the owned organization to edit it
7. It gets itself as parent