From 1871d42e68e37a3bd4414743e6febdefa8d95aae Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Tue, 26 Aug 2014 15:42:35 +1000
Subject: [PATCH] Switch to correct grammatical ordering of child/parent
 enterprise on enterprise relationships page

---
 app/models/enterprise_relationship.rb                     | 2 +-
 .../_enterprise_relationship.html.haml                    | 4 ++--
 app/views/admin/enterprise_relationships/_form.html.haml  | 4 ++--
 spec/features/admin/enterprise_relationships_spec.rb      | 2 +-
 spec/models/enterprise_relationship_spec.rb               | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/models/enterprise_relationship.rb b/app/models/enterprise_relationship.rb
index 8e2f3bcf06..dba99cc7b3 100644
--- a/app/models/enterprise_relationship.rb
+++ b/app/models/enterprise_relationship.rb
@@ -21,7 +21,7 @@ class EnterpriseRelationship < ActiveRecord::Base
     where('enterprise_relationship_permissions.name = ?', permission)
   }
 
-  scope :by_name, with_enterprises.order('parent_enterprises.name, child_enterprises.name')
+  scope :by_name, with_enterprises.order('child_enterprises.name, parent_enterprises.name')
 
 
   def permissions_list=(perms)
diff --git a/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml b/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml
index 56f0d46c01..6a7dcdc7f4 100644
--- a/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml
+++ b/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml
@@ -1,8 +1,8 @@
-%td {{ enterprise_relationship.parent_name }}
+%td {{ enterprise_relationship.child_name }}
 %td
   %ul
     %li{"ng-repeat" => "permission in enterprise_relationship.permissions"}
       {{ EnterpriseRelationships.permission_presentation(permission.name) }}
-%td {{ enterprise_relationship.child_name }}
+%td {{ enterprise_relationship.parent_name }}
 %td.actions
   %a.delete-enterprise-relationship.icon-trash.no-text{'ng-click' => 'delete(enterprise_relationship)'}
diff --git a/app/views/admin/enterprise_relationships/_form.html.haml b/app/views/admin/enterprise_relationships/_form.html.haml
index b9c2f265cd..2fe9402d3a 100644
--- a/app/views/admin/enterprise_relationships/_form.html.haml
+++ b/app/views/admin/enterprise_relationships/_form.html.haml
@@ -1,6 +1,6 @@
 %tr
   %td
-    %select{name: "enterprise_relationship_parent_id", "ng-model" => "parent_id", "ng-options" => "e.id as e.name for e in Enterprises.my_enterprises"}
+    %select{name: "enterprise_relationship_child_id", "ng-model" => "child_id", "ng-options" => "e.id as e.name for e in Enterprises.all_enterprises"}
   %td
     permits
     / %div{"ng-repeat" => "permission in EnterpriseRelationships.all_permissions"}
@@ -8,7 +8,7 @@
     /     %input{type: "checkbox", "ng-model" => "permissions[permission]"}
     /     {{ EnterpriseRelationships.permission_presentation(permission) }}
   %td
-    %select{name: "enterprise_relationship_child_id", "ng-model" => "child_id", "ng-options" => "e.id as e.name for e in Enterprises.all_enterprises"}
+    %select{name: "enterprise_relationship_parent_id", "ng-model" => "parent_id", "ng-options" => "e.id as e.name for e in Enterprises.my_enterprises"}
   %td.actions
     %input{type: "button", value: "Create", "ng-click" => "create()"}
     .errors {{ EnterpriseRelationships.create_errors }}
diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb
index ba7dbb2fec..0dadb25848 100644
--- a/spec/features/admin/enterprise_relationships_spec.rb
+++ b/spec/features/admin/enterprise_relationships_spec.rb
@@ -119,6 +119,6 @@ feature %q{
   def have_relationship(parent, child, perms=[])
     perms = perms.join(' ') || 'permits'
 
-    have_table_row [parent.name, perms, child.name, '']
+    have_table_row [child.name, perms, parent.name, '']
   end
 end
diff --git a/spec/models/enterprise_relationship_spec.rb b/spec/models/enterprise_relationship_spec.rb
index 3201e1db5c..3a6c48e891 100644
--- a/spec/models/enterprise_relationship_spec.rb
+++ b/spec/models/enterprise_relationship_spec.rb
@@ -6,10 +6,10 @@ describe EnterpriseRelationship do
     let(:e2)  { create(:enterprise, name: 'B') }
     let(:e3)  { create(:enterprise, name: 'C') }
 
-    it "sorts by parent, child enterprise name" do
-      er1 = create(:enterprise_relationship, parent: e1, child: e3)
-      er2 = create(:enterprise_relationship, parent: e2, child: e1)
-      er3 = create(:enterprise_relationship, parent: e1, child: e2)
+    it "sorts by child, parent enterprise name" do
+      er1 = create(:enterprise_relationship, parent: e3, child: e1)
+      er2 = create(:enterprise_relationship, parent: e1, child: e2)
+      er3 = create(:enterprise_relationship, parent: e2, child: e1)
 
       EnterpriseRelationship.by_name.should == [er3, er1, er2]
     end