Merge pull request #81 from SU-SWS/rc3

Rc3
SU-SWS · Aug 30, 2016 · adcfd83 · adcfd83
2 parents 9acbb58 + d285ec1
commit adcfd83
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/modules/capx_auto_nodetitle/capx_auto_nodetitle.info b/modules/capx_auto_nodetitle/capx_auto_nodetitle.info
@@ -2,7 +2,7 @@ name = CAPX Auto Node Title Support
 description = Allows support for the auto_nodetitle module
 core = 7.x
 package = Stanford
-version = 7.x-2.0-rc2
+version = 7.x-2.0-rc3
 project = capx_auto_nodetitle
 dependencies[] = auto_nodetitle
 dependencies[] = stanford_capx

diff --git a/modules/capx_issue_collector/capx_issue_collector.info b/modules/capx_issue_collector/capx_issue_collector.info
@@ -1,6 +1,6 @@
 name = Stanford CAPx Issue Collector
 description = Provides a feedback link to the CAPx Working Group Jira project.
 core = 7.x
-version = 7.x-2.0-rc2
+version = 7.x-2.0-rc3
 package = Stanford CAPx
 ; scripts[] = capx_issue_collector.js
diff --git a/stanford_capx.entity.hooks.inc b/stanford_capx.entity.hooks.inc
@@ -297,7 +297,7 @@ function stanford_capx_taxonomy_term_load($terms) {
   // For each term add the aliases to them if they are a part of the org vocab.
   foreach($terms as &$term) {
     if ($term->vocabulary_machine_name == $vocab_name) {
-      $term->capx = array("aliases" => $aliases[$term->tid]);
+      $term->capx = array("aliases" => $aliases);
     }
   }
 

diff --git a/stanford_capx.forms.inc b/stanford_capx.forms.inc
@@ -689,6 +689,7 @@ function stanford_capx_filter_properties($entity_type, $properties = array()) {
   $blacklist['node'][] = "comment_count";
   $blacklist['node'][] = "comment_count_new";
   $blacklist['node'][] = "feed_nid";
+  $blacklist['node'][] = "feed_node";
   $blacklist['node'][] = "uuid";
   $blacklist['node'][] = "vuuid";
   $blacklist['node'][] = "log";

diff --git a/stanford_capx.info b/stanford_capx.info
@@ -3,7 +3,7 @@ description = Provides the ability to import profiles into existing entity types
 core = 7.x
 package = Stanford CAPx
 project = stanford_capx
-version = 7.x-2.0-rc2
+version = 7.x-2.0-rc3
 
 dependencies[] = entity
 dependencies[] = block

diff --git a/stanford_capx.install b/stanford_capx.install
@@ -3,6 +3,8 @@
  * @file
  */
 
+use CAPx\Drupal\Util\CAPxMapper;
+
 /**
  * Implements hook_install().
  */
@@ -278,7 +280,7 @@ function stanford_capx_requirements($phase) {
 /**
  * Add the guuid field to the capx_profiles table.
  */
-function stanford_capx_update_7100() {
+function stanford_capx_update_7200() {
 
   $table = "capx_profiles";
   $field = "guuid";
@@ -293,3 +295,25 @@ function stanford_capx_update_7100() {
   db_add_field($table, $field, $spec);
 
 }
+
+/**
+ * If auto_nodetitle is enabled we should enable capx_auto_nodetitle.
+ */
+function stanford_capx_update_7201() {
+  if (module_exists("auto_nodetitle")) {
+    module_enable(array("capx_auto_nodetitle"));
+  }
+}
+
+/**
+ * Resave each mapper so they get the new default config keys.
+ */
+function stanford_capx_update_7202() {
+  $mappers = CAPxMapper::loadAllMappers();
+  foreach ($mappers as $mapper) {
+    $mapper->settings['multiple'] = FALSE;
+    $mapper->settings['subquery'] = '';
+    $mapper->settings['guuidquery'] = '';
+    $mapper->save();
+  }
+}