From 26065a1aa30db5bc678acecaa04b1b5e2142b84c Mon Sep 17 00:00:00 2001
From: nikitasinelnikov <nsinelnikov.work@gmail.com>
Date: Fri, 3 Jan 2020 12:49:26 +0200
Subject: [PATCH] - added redirect after metatable settings upgrade

---
 includes/admin/assets/js/um-admin-forms.js   |  2 +-
 includes/admin/core/class-admin-enqueue.php  |  5 +++++
 includes/admin/core/class-admin-notices.php  | 15 +++++++++++----
 includes/admin/core/class-admin-settings.php |  2 ++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/includes/admin/assets/js/um-admin-forms.js b/includes/admin/assets/js/um-admin-forms.js
index 6c49ddb5..38eec01b 100644
--- a/includes/admin/assets/js/um-admin-forms.js
+++ b/includes/admin/assets/js/um-admin-forms.js
@@ -108,7 +108,7 @@ jQuery(document).ready( function() {
 						}
 					});
 				} else {
-					return false;
+					window.location = um_forms_data.successfully_redirect;
 				}
 			}
 		}
diff --git a/includes/admin/core/class-admin-enqueue.php b/includes/admin/core/class-admin-enqueue.php
index 2ea71de9..25a0f753 100644
--- a/includes/admin/core/class-admin-enqueue.php
+++ b/includes/admin/core/class-admin-enqueue.php
@@ -228,6 +228,11 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
 			wp_enqueue_style( 'um_admin_forms' );
 
 			wp_register_script( 'um_admin_forms', $this->js_url . 'um-admin-forms.js', array( 'jquery', 'wp-i18n' ), ultimatemember_version, true );
+
+			wp_localize_script( 'um_admin_forms', 'um_forms_data', array(
+				'successfully_redirect' => add_query_arg( array( 'page' => 'um_options', 'tab' => 'misc', 'msg' => 'updated' ), admin_url( 'admin.php' ) ),
+			) );
+
 			wp_enqueue_script( 'um_admin_forms' );
 		}
 
diff --git a/includes/admin/core/class-admin-notices.php b/includes/admin/core/class-admin-notices.php
index a4cb6275..996e6aa2 100644
--- a/includes/admin/core/class-admin-notices.php
+++ b/includes/admin/core/class-admin-notices.php
@@ -579,10 +579,17 @@ if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) {
 				), 4 );
 			} else {
 				if ( isset( $_GET['msg'] ) && 'updated' == $_GET['msg'] ) {
-					$this->add_notice( 'upgrade', array(
-						'class'     => 'updated',
-						'message'   => '<p>' . sprintf( __( '<strong>%s %s</strong> Successfully Upgraded', 'ultimate-member' ), ultimatemember_plugin_name, ultimatemember_version ) . '</p>',
-					), 4 );
+					if ( isset( $_GET['page'] ) && 'um_options' == $_GET['page'] ) {
+						$this->add_notice( 'settings_upgrade', array(
+							'class'     => 'updated',
+							'message'   => '<p>' . __( 'Settings successfully upgraded', 'ultimate-member' ) . '</p>',
+						), 4 );
+					} else {
+						$this->add_notice( 'upgrade', array(
+							'class'     => 'updated',
+							'message'   => '<p>' . sprintf( __( '<strong>%s %s</strong> Successfully Upgraded', 'ultimate-member' ), ultimatemember_plugin_name, ultimatemember_version ) . '</p>',
+						), 4 );
+					}
 				}
 			}
 		}
diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php
index aa5ad4d6..acb181eb 100644
--- a/includes/admin/core/class-admin-settings.php
+++ b/includes/admin/core/class-admin-settings.php
@@ -131,6 +131,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
 
 				update_option( 'um_member_directory_update_meta', time() );
 
+				UM()->options()->update( 'member_directory_own_table', true );
+
 				wp_send_json_success();
 			} elseif ( 'um_get_metadata' == $_POST['cb_func'] ) {
 				global $wpdb;