From e9109614ed1fc07ec8fe7c9dd4c8df8e766e8b59 Mon Sep 17 00:00:00 2001
From: Your Name <01namangupta@gmail.com>
Date: Mon, 9 Oct 2017 18:24:36 +0530
Subject: [PATCH 1/2] error opening revision history is removed

---
 .../versions/_object_desc_and_link.html.haml  | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/views/admin/versions/_object_desc_and_link.html.haml b/app/views/admin/versions/_object_desc_and_link.html.haml
index a924a4cf..ad4ac2e9 100644
--- a/app/views/admin/versions/_object_desc_and_link.html.haml
+++ b/app/views/admin/versions/_object_desc_and_link.html.haml
@@ -12,10 +12,13 @@
   - role = Role.find_by(id: users_role.role_id) if users_role
   role
   - if role.name == 'organization_admin'
-    -# organization_admin belongs to organization and not conferences
-    - organization = Organization.find(version.conference_id)
-    = link_if_alive version, role.name,
+    - if Organization.find_by(id: version.conference_id)
+      -# organization_admin belongs to organization and not conferences
+      - organization = Organization.find_by(id: version.conference_id)
+      = link_if_alive version, role.name,
             admins_admin_organization_path(organization), organization
+    - else
+      (Deleted Organization)
   - else
     - conference = Conference.find_by(id: version.conference_id)
     - conference_short_title = conference.try(:short_title) || current_or_last_object_state('Conference', version.conference_id).try(:short_title) || ' '
@@ -140,10 +143,13 @@
   - role = current_or_last_object_state(version.item_type, version.item_id)
   - role_name = role.try(:name) || PaperTrail::Version.where(item_type: 'Role', item_id: version.item_id).last.changeset[:name].second
   - if role_name == 'organization_admin'
-    -# organization_admin belongs to organization and not conferences
-    - organization = Organization.find(version.conference_id)
-    = link_if_alive version, role_name,
+    - if Organization.find_by(id: version.conference_id)
+      -# organization_admin belongs to organization and not conferences
+      - organization = Organization.find_by(id: version.conference_id)
+      = link_if_alive version, role.name,
             admins_admin_organization_path(organization), organization
+    - else
+      (Role Deleted)
   - else
     - conference = Conference.find_by(id: version.conference_id)
     - conference_short_title = conference.try(:short_title) || current_or_last_object_state('Conference', version.conference_id).try(:short_title) || ' '
@@ -224,7 +230,13 @@
 - unless %w(Conference Subscription Registration User Organization).include?(version.item_type)
   - if (version.item_type == 'Role' && role_name == 'organization_admin') || (version.item_type == 'UsersRole' && role.name == 'organization_admin')
     in organization
-    = link_to_organization(version.conference_id)
+    - if Organization.find_by(id: version.conference_id)
+      -# organization_admin belongs to organization and not conferences
+      - organization = Organization.find_by(id: version.conference_id)
+      = link_if_alive version, role.name,
+            admins_admin_organization_path(organization), organization
+    - else
+      (Organization Deleted)
   - else
     in conference
     = link_to_conference(version.conference_id)

From aaa34c64afa1754cbd7dc18ab65461b0aab0d624 Mon Sep 17 00:00:00 2001
From: Naman Gupta <01namangupta@gmail.com>
Date: Fri, 20 Oct 2017 23:38:59 +0530
Subject: [PATCH 2/2] link is corrected

---
 app/views/admin/versions/_object_desc_and_link.html.haml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/admin/versions/_object_desc_and_link.html.haml b/app/views/admin/versions/_object_desc_and_link.html.haml
index 1651fed4..4852a50f 100644
--- a/app/views/admin/versions/_object_desc_and_link.html.haml
+++ b/app/views/admin/versions/_object_desc_and_link.html.haml
@@ -233,8 +233,7 @@
     - if Organization.find_by(id: version.conference_id)
       -# organization_admin belongs to organization and not conferences
       - organization = Organization.find_by(id: version.conference_id)
-      = link_if_alive version, role.name,
-            admins_admin_organization_path(organization), organization
+      = link_to_organization(version.conference_id)
     - else
       (Organization Deleted)
   - else