Merge pull request #894 from NuCivic/facet-icons-move

Move facet_icons module into dkan_sitewide, add update hook. Working properly.
GetDKAN · Feb 2, 2016 · 019bab2 · 019bab2
2 parents 7993db8 + 004073f
commit 019bab2
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 2 deletions.
diff --git a/modules/dkan/dkan_sitewide/dkan_sitewide.info b/modules/dkan/dkan_sitewide/dkan_sitewide.info
@@ -11,6 +11,7 @@ dependencies[] = defaultconfig
 dependencies[] = dkan_dataset
 dependencies[] = dkan_dataset_content_types
 dependencies[] = features
+dependencies[] = facet_icons
 dependencies[] = filter
 dependencies[] = fontyourface
 dependencies[] = fontyourface_ui

diff --git a/modules/dkan/dkan_sitewide/dkan_sitewide.install b/modules/dkan/dkan_sitewide/dkan_sitewide.install
@@ -10,4 +10,11 @@
   */ 
 function dkan_sitewide_update_7001(){
   module_enable(array('field_reference_delete'));
-}
+}
+
+/**
+ * Enable facet_icons.
+ */
+function dkan_sitewide_update_7002(){
+  module_enable(array('facet_icons'));
+}
diff --git a/modules/dkan/dkan_sitewide/modules/dkan_sitewide_search_db/dkan_sitewide_search_db.info b/modules/dkan/dkan_sitewide/modules/dkan_sitewide_search_db/dkan_sitewide_search_db.info
@@ -5,7 +5,6 @@ package = DKAN
 project = dkan
 dependencies[] = ctools
 dependencies[] = entity
-dependencies[] = facet_icons
 dependencies[] = facetapi
 dependencies[] = search_api
 dependencies[] = search_api_db

diff --git a/...h_db/modules/facet_icons/facet_icons.info → ...wide/modules/facet_icons/facet_icons.info b/...h_db/modules/facet_icons/facet_icons.info → ...wide/modules/facet_icons/facet_icons.info
diff --git a/...db/modules/facet_icons/facet_icons.module → ...de/modules/facet_icons/facet_icons.module b/...db/modules/facet_icons/facet_icons.module → ...de/modules/facet_icons/facet_icons.module
diff --git a/...facet_icons/widget_content_type_icons.inc → ...facet_icons/widget_content_type_icons.inc b/...facet_icons/widget_content_type_icons.inc → ...facet_icons/widget_content_type_icons.inc
diff --git a/...modules/facet_icons/widget_term_icons.inc → ...modules/facet_icons/widget_term_icons.inc b/...modules/facet_icons/widget_term_icons.inc → ...modules/facet_icons/widget_term_icons.inc