Add Farm Access and Role Delegation modules.

README.md

@@ -6,6 +6,7 @@ A Drupal installation profile for farms. http://drupal.org/project/farm
 This project aims to provide a Drupal distribution for use in agriculture. It
 comes pre-packaged with a set of farm-related modules, including:
 
+* [Farm Access](http://drupal.org/project/farm_access)
 * [Farm Admin](http://drupal.org/project/farm_admin)
 * [Farm Area](http://drupal.org/project/farm_area)
 * [Farm Asset](http://drupal.org/project/farm_asset)
@@ -14,7 +15,6 @@ comes pre-packaged with a set of farm-related modules, including:
 * [Farm Fields](http://drupal.org/project/farm_fields)
 * [Farm Livestock](http://drupal.org/project/farm_livestock)
 * [Farm Log](http://drupal.org/project/farm_log)
-* [Farm Manager](http://drupal.org/project/farm_manager)
 * [Farm Map](http://drupal.org/project/farm_map)
 * [Farm MapKnitter](http://drupal.org/project/farm_mapknitter)
 * [Farm Maple](http://drupal.org/project/farm_maple)

drupal-org.make

@@ -105,6 +105,9 @@ projects[registry_autoload][version] = "1.2"
 projects[restws][subdir] = "contrib"
 projects[restws][version] = "2.4"
 
+projects[role_delegation][subdir] = "contrib"
+projects[role_delegation][version] = "1.1"
+
 projects[role_export][subdir] = "contrib"
 projects[role_export][version] = "1.0"
 
@@ -156,6 +159,9 @@ projects[module_filter][version] = "2.0"
 ; Modules (farm)
 ; -----------------------------------------------------------------------------
 
+projects[farm_access][subdir] = "farm"
+projects[farm_access][version] = "1.0"
+
 projects[farm_admin][subdir] = "farm"
 projects[farm_admin][version] = "1.0-beta5"
 
@@ -190,7 +196,7 @@ projects[farm_maple][subdir] = "farm"
 projects[farm_maple][version] = "1.x-dev"
 
 projects[farm_manager][subdir] = "farm"
-projects[farm_manager][version] = "1.0-beta5"
+projects[farm_manager][version] = "1.0-beta7"
 
 projects[farm_mushroom][subdir] = "farm"
 projects[farm_mushroom][version] = "1.x-dev"

farm.info

@@ -39,6 +39,7 @@ dependencies[] = navbar
 dependencies[] = restws
 
 ; Farm
+dependencies[] = farm_access
 dependencies[] = farm_admin
 dependencies[] = farm_area
 dependencies[] = farm_asset
@@ -48,7 +49,6 @@ dependencies[] = farm_fields
 dependencies[] = farm_livestock
 dependencies[] = farm_livestock_eggs
 dependencies[] = farm_log
-dependencies[] = farm_manager
 dependencies[] = farm_map
 dependencies[] = farm_soil
 dependencies[] = farm_soil_test

farm.install

@@ -139,6 +139,22 @@ function farm_update_7006(&$sandbox) {
   _farm_enable_modules(array('exif_orientation'));
 }
 
+/**
+ * Load Openlayers via CDN.
+ */
+function farm_update_7007(&$sandbox) {
+
+  // Enable the Farm Access module.
+  _farm_enable_modules(array('farm_access'));
+  
+  // Disable and uninstall the Farm Manager module.
+  $module = 'farm_manager';
+  if (module_exists($module)) {
+    module_disable(array($module));
+    drupal_uninstall_modules(array($module));
+  }
+}
+
 /**
  * Helper function: enable modules.
  */