diff --git a/devops/uw_devops.inc b/devops/uw_devops.inc index aaaafd54025f086c4e8fc1ae640ae754927f02b8..ccc9beb60bcc7439054f26d204e84dd67e7f6630 100644 --- a/devops/uw_devops.inc +++ b/devops/uw_devops.inc @@ -273,8 +273,8 @@ function pool_info($fqdn = FALSE) { foreach ($pools as &$pool) { $pool['host'] .= 'uwaterloo.ca'; $pool['dbmach'] .= '.uwaterloo.ca'; - foreach ($pool['engine'] as &$engine) { - $engine .= '.uwaterloo.ca'; + foreach (array_keys($pool['engine']) as $key) { + $pool['engine'][$key] .= '.uwaterloo.ca'; } } } diff --git a/devops/uw_devops.sites.inc b/devops/uw_devops.sites.inc index 16c91175048df664abfcd96167203ba255230a38..7d3933bd03e21a0cada62b2a9135747dff15f99a 100644 --- a/devops/uw_devops.sites.inc +++ b/devops/uw_devops.sites.inc @@ -33,7 +33,6 @@ function create_skeleton($site_url, $profile_version_name, array $redirects = ar $pool_info = pool_info(); $engine = $pool_info[$pool]['engine']; $dbmach = $pool_info[$pool]['dbmach']; - $host = $pool_info[$pool]['host']; echo "Checking if destination profile exists...\n"; if (!$drupal_root = valid_drupal_root($engine[0], WEB_ROOT . '/' . $profile_version_name)) { @@ -569,7 +568,6 @@ function drush_install_site($pool, $url_path, $profile = NULL, array $site_argum echo "Starting Drush site install...\n"; $file_path = url_path_to_file_path($url_path); - $file_path_root = get_drupal_root($pool, $url_path) . '/sites/' . $file_path; if (!$profile) { $profile = get_profile_version($pool, $url_path); @@ -681,7 +679,7 @@ function site_copy_full($from_url, $to, $create_skeleton = TRUE) { throw new Exception('"from" and "to" are the same place.'); } - if ($from_url_path !== $to_url_path && site_makefile_exists($from_url_path)) { + if ($from_url_path !== $to_url_path && site_makefile_exists($from_url_path) && !site_makefile_exists($to_url_path)) { throw new Exception('Site has a makefile. You must rename it before copying so that the skeleton will have the makefile built in it.'); } diff --git a/uw_wcms_tools.drupal.modules.inc b/uw_wcms_tools.drupal.modules.inc index 2e34aecc27c7b7f67359cad5de8865563f16c329..b3697bde965a1c7656c043ea403f84134adf6a9e 100644 --- a/uw_wcms_tools.drupal.modules.inc +++ b/uw_wcms_tools.drupal.modules.inc @@ -39,7 +39,7 @@ function uw_wcms_tools_contrib_module_update_form_validate(array $form, array &$ $form_state['values']['version'] = $matches[2]; } else { - form_set_error('url', 'Invalid module update URL.'); + form_set_error('url', t('Invalid module update URL.')); } } diff --git a/uw_wcms_tools.gitlab.inc b/uw_wcms_tools.gitlab.inc index 48f6a1588e58f09785374f7584e8e7cb2ac30451..7573b998fa8d46a863fd422f0d368a5cfac72d5b 100644 --- a/uw_wcms_tools.gitlab.inc +++ b/uw_wcms_tools.gitlab.inc @@ -497,7 +497,7 @@ function uw_wcms_tools_gitlab_project_create(string $group, string $path): array if ($r['http_status'] === 201) { // Settings do not all save on creation, so update them here. uw_wcms_tools_gitlab_project_update_features($r['body']->id); - $teams = uw_wcms_tools_gitlab_project_ms_teams_integration_update($r['body']->id); + uw_wcms_tools_gitlab_project_ms_teams_integration_update($r['body']->id); } return $r; diff --git a/uw_wcms_tools.module b/uw_wcms_tools.module index 4525b5d22f35fdf8921148063f6b7cf7b162f2e4..84cf737fa900a2e43ed0707b3757e62a2abffe76 100644 --- a/uw_wcms_tools.module +++ b/uw_wcms_tools.module @@ -12,6 +12,7 @@ function uw_wcms_tools_menu() { $items = array(); $items['wcms-tools'] = [ 'page callback' => 'drupal_goto', + // Always allow redirect. 'access callback' => TRUE, ]; $items['wcms-tools/tickets'] = [ diff --git a/uw_wcms_tools.tickets.inc b/uw_wcms_tools.tickets.inc index 8296bead4c7f3b89bf874f1a42a09272876b0116..edb915a11c76ca72d5f79f664a2f9eaa7ade50ce 100644 --- a/uw_wcms_tools.tickets.inc +++ b/uw_wcms_tools.tickets.inc @@ -47,7 +47,7 @@ function uw_wcms_tools_ticket_create_form_validate(array $form, array &$form_sta $type = 'RT'; } if (!$id) { - form_set_error('url', 'Invalid ticket ID.'); + form_set_error('url', t('Invalid ticket ID.')); } $form_state['values']['ticket_id'] = $id; $form_state['values']['ticket_type'] = $type;