cleaning out unused helpers, making some helpers load more cleanly

samvera · Apr 30, 2011 · 890c761 · 890c761
1 parent f4a63dd
commit 890c761
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 508 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -6,13 +6,13 @@
 # Load Blacklight's ApplicationController first
 require_dependency "vendor/plugins/blacklight/app/controllers/application_controller.rb"
 
-class ApplicationController 
+class ApplicationController
 
   include HydraAccessControlsHelper
 
   helper :all
-  helper :hydra_access_controls, :hydra_djatoka, :downloads, :metadata, :hydra, :custom_metadata, :hydra_fedora_metadata, :hydra_assets
-  helper :generic_content_objects, :personalization, :hydrangea_datasets
+  helper :hydra_access_controls, :hydra_djatoka, :downloads, :hydra, :hydra_fedora_metadata, :hydra_assets
+  helper :generic_content_objects, :personalization
 
   # helper_method [:request_is_for_user_resource?]#, :user_logged_in?]
   before_filter [:store_bounce]

diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb
@@ -10,7 +10,7 @@ class AssetsController < ApplicationController
 
 
     include Blacklight::CatalogHelper
-    helper :hydra, :metadata, :infusion_view
+    helper :hydra
 
     before_filter :search_session, :history_session
     before_filter :require_solr, :require_fedora

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1,3 +1,4 @@
+require "hydra_helper"
 module ApplicationHelper
   include Stanford::SearchworksHelper
   #include Stanford::SolrHelper # this is already included by the SearchworksHelper

diff --git a/app/helpers/custom_metadata_helper.rb b/app/helpers/custom_metadata_helper.rb