← All changes | admin/class-wp-data-access-admin.php +2 -76 5.5.82 → 5.5.84 View file →

		@@ -305,9 +305,9 @@
305	305	plugins_url( '../assets/css/responsive.dataTables.min.css', __FILE__ ),
306	306	array(),
307	307	WPDA::get_option( WPDA::OPTION_WPDA_VERSION )
308	308	);
309		- if ( self::PAGE_MAIN === $this->page || self::PAGE_APPS === $this->page || self::PAGE_DASHBOARD === $this->page || self::PAGE_QUERY_BUILDER === $this->page || self::PAGE_PUBLISHER === $this->page || self::PAGE_CHARTS === $this->page ) {
	309	+ if ( self::PAGE_MAIN === $this->page || self::PAGE_APPS === $this->page || self::PAGE_DASHBOARD === $this->page || self::PAGE_PUBLISHER === $this->page || self::PAGE_CHARTS === $this->page ) {
310	310	// Load UI smoothness theme.
311	311	wp_enqueue_style(
312	312	'wpda_ui_smoothness',
313	313	plugins_url( '../assets/css/jquery-ui.smoothness.min.css', __FILE__ ),
		@@ -353,23 +353,8 @@
353	353	WPDA::get_option( WPDA::OPTION_WPDA_VERSION ),
354	354	false
355	355	);
356	356	}
357		- if ( self::PAGE_QUERY_BUILDER === $this->page ) {
358		- // Add Query Builder resources.
359		- wp_enqueue_style(
360		- 'wpda_query_builder',
361		- plugins_url( '../assets/css/wpda_query_builder.css', __FILE__ ),
362		- array(),
363		- WPDA::get_option( WPDA::OPTION_WPDA_VERSION )
364		- );
365		- wp_enqueue_style(
366		- 'wpda_jquery_json_viewer',
367		- plugins_url( '../assets/css/jquery.json-viewer.css', __FILE__ ),
368		- array(),
369		- WPDA::get_option( WPDA::OPTION_WPDA_VERSION )
370		- );
371		- }
372	357	if ( !WPDA::current_user_is_admin() ) {
373	358	wp_enqueue_style(
374	359	'wpda_non_admin',
375	360	plugins_url( '../assets/css/wpda_non_admin.css', __FILE__ ),
		@@ -530,46 +515,8 @@
530	515	}
531	516	if ( self::PAGE_CHARTS === $this->page ) {
532	517	$this->load_google_charts();
533	518	}
534		- if ( self::PAGE_QUERY_BUILDER === $this->page ) {
535		- // Add Query Builder resources.
536		- wp_enqueue_script(
537		- 'wpda_query_builder',
538		- plugins_url( '../assets/js/wpda_query_builder.js', __FILE__ ),
539		- array(),
540		- WPDA::get_option( WPDA::OPTION_WPDA_VERSION ),
541		- false
542		- );
543		- wp_enqueue_script(
544		- 'wpda_jquery_xml2json',
545		- plugins_url( '../assets/js/jquery.xml2json.js', __FILE__ ),
546		- array(),
547		- WPDA::get_option( WPDA::OPTION_WPDA_VERSION ),
548		- false
549		- );
550		- wp_enqueue_script(
551		- 'wpda_jquery_json_viewer',
552		- plugins_url( '../assets/js/jquery.json-viewer.js', __FILE__ ),
553		- array(),
554		- WPDA::get_option( WPDA::OPTION_WPDA_VERSION ),
555		- false
556		- );
557		- // Add codeEditor to query builder.
558		- $cm_settings['codeEditor'] = wp_enqueue_code_editor( array(
559		- 'type' => 'text/x-sql',
560		- 'codemirror' => array(
561		- 'mode' => 'sql',
562		- 'lineNumbers' => true,
563		- 'autoRefresh' => true,
564		- 'lineWrapping' => true,
565		- 'styleActiveLine' => true,
566		- ),
567		- ) );
568		- wp_enqueue_script( 'wp-theme-plugin-editor' );
569		- wp_localize_script( 'wp-theme-plugin-editor', 'cm_settings', $cm_settings );
570		- wp_enqueue_style( 'wp-codemirror' );
571		- }
572	519	if ( self::PAGE_DASHBOARD === $this->page ) {
573	520	$this->load_google_charts();
574	521	// Load DBMS panels.
575	522	wp_enqueue_script(
		@@ -647,22 +594,8 @@
647	594	$this->add_data_projects();
648	595	// Hide admin menu.
649	596	return;
650	597	}
651		- if ( self::PAGE_MAIN === $this->page && isset( $_REQUEST['de'] ) ) {
652		- if ( 'new' === $_REQUEST['de'] ) {
653		- update_user_meta( WPDA::get_current_user_id(), 'wpda_data_explorer', 'new' );
654		- } elseif ( 'old' === $_REQUEST['de'] ) {
655		- update_user_meta( WPDA::get_current_user_id(), 'wpda_data_explorer', 'old' );
656		- }
657		- }
658		- if ( self::PAGE_QUERY_BUILDER === $this->page && isset( $_REQUEST['qb'] ) ) {
659		- if ( 'new' === $_REQUEST['qb'] ) {
660		- update_user_meta( WPDA::get_current_user_id(), 'wpda_query_builder_version', 'new' );
661		- } elseif ( 'old' === $_REQUEST['qb'] ) {
662		- update_user_meta( WPDA::get_current_user_id(), 'wpda_query_builder_version', 'old' );
663		- }
664		- }
665	598	// Main menu and items are only available to admin users (set capability to 'manage_options').
666	599	add_menu_page(
667	600	'WP Data Access',
668	601	'WP Data Access',
		@@ -708,9 +641,8 @@
708	641	self::PAGE_TABLE,
709	642	array($this, 'data_explorer_table_page')
710	643	);
711	644	// Add submenu for Query Builder.
712		- $current_query_builder_version = get_user_meta( WPDA::get_current_user_id(), 'wpda_query_builder_version', true );
713	645	$this->wpda_data_publisher_menu = add_submenu_page(
714	646	self::MAIN_PAGE_SLUG,
715	647	'WP Data Access',
716	648	'SQL Query Builder',
		@@ -715,9 +647,9 @@
715	647	'WP Data Access',
716	648	'SQL Query Builder',
717	649	'manage_options',
718	650	self::PAGE_QUERY_BUILDER,
719		- array($this, ( $current_query_builder_version === 'old' ? 'query_builder_old' : 'query_builder' ))
	651	+ array($this, 'query_builder')
720	652	);
721	653	// Add submenu for Data Tables.
722	654	$this->wpda_data_publisher_menu = add_submenu_page(
723	655	self::MAIN_PAGE_SLUG,
		@@ -999,14 +931,8 @@
999	931	*/
1000	932	public function query_builder() {
1001	933	WPDA_Dashboard::add_dashboard();
1002	934	$query_builder = new \WPDataAccess\Data_Apps\WPDA_Query_Builder();
1003		- $query_builder->show();
1004		- }
1005		-
1006		- public function query_builder_old() {
1007		- WPDA_Dashboard::add_dashboard();
1008		- $query_builder = new \WPDataAccess\Query_Builder\WPDA_Query_Builder();
1009	935	$query_builder->show();
1010	936	}
1011	937
1012	938	/**