Add admin_views to data_config features master CIVIC-5982 (#216)

* Add admin_views to data_config features master

* Update changelog

* Remake dkan to 1.14-RC1.

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Change log
+
+## [1.14.0.0]
+- Add admin_views to features master in data_config
+
 ## [1.13.7.0]
 - Update to dkan version 1.13.7
 - Fix ODSM Memory Error #402

assets/modules/data_config/data_config.module

@@ -23,6 +23,7 @@ function data_config_enabled_modules() {
     'admin_menu' => 'admin_menu',
     'admin_menu_source' => 'admin_menu_source',
     'admin_menu_toolbar' => 'admin_menu_toolbar',
+    'admin_views' => 'admin_views',
     'adminrole' => 'adminrole',
     'ape' => 'ape',
     'autocomplete_deluxe' => 'autocomplete_deluxe',

build-dkan.make

@@ -8,7 +8,5 @@ includes[core] = dkan/drupal-org-core.make
 projects[dkan][type] = profile
 projects[dkan][download][type] = git
 projects[dkan][download][url] = https://github.com/NuCivic/dkan.git
-projects[dkan][download][tag] = 7.x-1.13.7
+projects[dkan][download][tag] = 7.x-1.14-RC1
 
-projects[dkan][patch][] = https://patch-diff.githubusercontent.com/raw/NuCivic/dkan/pull/1976.diff
-projects[dkan][patch][] = https://patch-diff.githubusercontent.com/raw/NuCivic/dkan/pull/2095.diff

dkan/.ahoy/.scripts/.ht.router.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file
  * Routing-script for the built-in PHP web server.
@@ -26,17 +25,21 @@
   // Serve the requested resource as-is.
   return FALSE;
 }
+
 // The use of a router-script means that a number of $_SERVER variables has to
 // be updated to point to the index-file.
 $index_file_absolute = $_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . 'index.php';
 $index_file_relative = DIRECTORY_SEPARATOR . 'index.php';
+
 // SCRIPT_FILENAME will point to the router-script itself, it should point to
 // the full path to index.php.
 $_SERVER['SCRIPT_FILENAME'] = $index_file_absolute;
+
 // SCRIPT_NAME and PHP_SELF will either point to /index.php or contain the full
 // virtual path being requested depending on the url being requested. They
 // should always point to index.php relative to document root.
 $_SERVER['SCRIPT_NAME'] = $index_file_relative;
 $_SERVER['PHP_SELF'] = $index_file_relative;
+
 // Require the main index-file and let core take over.
 require $index_file_absolute;

dkan/.ahoy/.scripts/mysql-reconnect.sh

@@ -0,0 +1,11 @@
+SETTINGS_PATH=docroot/sites/default/settings.php
+DIR=$(dirname $SETTINGS_PATH)
+chmod +w $SETTINGS_PATH 
+chmod +w $DIR
+echo ".. Reconnect mysql."
+MYSQL_IP=`echo $1 | sed 's/.*@\(.*\)\/.*/\1/g'`
+sed -i "s/\(^\s*\)'host' => \(.*\),/\1'host' => '$MYSQL_IP',/g" $SETTINGS_PATH
+
+chmod -w $SETTINGS_PATH 
+chmod -w $DIR
+

dkan/.ahoy/.scripts/server.sh

@@ -9,4 +9,4 @@ cp ./dkan/.ahoy/.scripts/.ht.router.php ./docroot/
 cd ./docroot
 
 echo $HOST
-php -S $HOST:8888 .ht.router.php
+php -S $HOST:8888 .ht.router.php

dkan/.ahoy/dkan.ahoy.yml

@@ -20,7 +20,11 @@ commands:
       if [ -d docroot ]
         then
           ahoy confirm "./docroot folder alredy exists. Delete it and reinstall drupal?" && chmod -R 777 docroot/sites/default && rm -rf docroot ||
-          { echo ".. skipping installation"; exit 1;}
+          {
+            echo ".. skipping installation";
+            ahoy cmd-proxy bash dkan/.ahoy/.scripts/mysql-reconnect.sh $ARGS
+            exit 1;
+          }
       fi
       ahoy cmd-proxy bash dkan/.ahoy/.scripts/drupal-rebuild.sh $ARGS
 
@@ -46,7 +50,7 @@ commands:
       if [ ! -d backups ]; then
         mkdir backups
       fi
-      if [ -f backups/last_install.sql ] && ahoy confirm "An existing installation backup exists at backups/last_install.sql, do you want to use that instead of reinstalling from scratch?"; then
+      if [ -f backups/last_install.sql ] && ahoy confirm "{{args}} An existing installation backup exists at backups/last_install.sql, do you want to use that instead of reinstalling from scratch?"; then
 
         ahoy drush sql-drop -y && \
         echo "... Removed tables, restoring DB"