diff --git a/app/components/doctrine_index_table_component/doctrine_index_table_component.html.erb b/app/components/doctrine_index_table_component/doctrine_index_table_component.html.erb
index 81af1cb..cff8648 100644
--- a/app/components/doctrine_index_table_component/doctrine_index_table_component.html.erb
+++ b/app/components/doctrine_index_table_component/doctrine_index_table_component.html.erb
@@ -3,7 +3,6 @@
Reference Number |
Title |
Date |
- PhilRep |
@@ -12,7 +11,6 @@
<%= document_reference_number(search_result.document) %> |
<%= document_title(search_result.document) %> |
<%= date_or_year(search_result.document) %> |
- <%= search_result.annotations.map(&:phil_rep).join(", ") %> |
<% end %>
diff --git a/app/components/document_doctrine_show_component.rb b/app/components/document_doctrine_show_component.rb
index 010b971..4967499 100644
--- a/app/components/document_doctrine_show_component.rb
+++ b/app/components/document_doctrine_show_component.rb
@@ -34,7 +34,7 @@ class DocumentDoctrineShowComponent < BaseComponent
end
def all_subjects
- Cdao::Subject.all
+ Cdao::Subject.all.order(name: :asc)
end
def date_or_year(annotation)
diff --git a/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb b/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb
index bb7ee09..1831b78 100644
--- a/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb
+++ b/app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb
@@ -162,7 +162,7 @@
<% ad_date_or_year = annotated_document.docdate.present? ? annotated_document.docdate.strftime("%B %d, %Y") : annotated_document.year %>
<% annotated_documents_title << [" citing #{ad_title}", annotated_document.reference_number, ad_date_or_year].join(", ") %>
<% end %>
- <%= raw [document_title, annotation.document.reference_number, date_or_year, annotation.phil_rep, annotated_documents_title].reject(&:blank?).join(', ').html_safe %>
+ <%= raw [document_title, annotation.document.reference_number, date_or_year, annotation.phil_rep].reject(&:blank?).join(', ').html_safe %>
diff --git a/app/components/subject_accordion_component/subject_accordion_component.html.erb b/app/components/subject_accordion_component/subject_accordion_component.html.erb
index e51103b..7a0011c 100644
--- a/app/components/subject_accordion_component/subject_accordion_component.html.erb
+++ b/app/components/subject_accordion_component/subject_accordion_component.html.erb
@@ -1,4 +1,4 @@
-<% parent.children.each do |sub1| %>
+<% parent.children.order(name: :asc).each do |sub1| %>