Merge pull request #233 from contactashish13/issue-226

remove chart types page while editing

Author: selul

classes/Visualizer/Module/Chart.php

@@ -262,9 +262,14 @@ public function renderChartPages() {
 		// dispatch pages
 		$this->_chart = get_post( $chart_id );
 		$tab    = isset( $_GET['tab'] ) && ! empty( $_GET['tab'] ) ? $_GET['tab'] : 'visualizer';
+
+		// skip chart type pages only for existing charts.
+		if ( VISUALIZER_SKIP_CHART_TYPE_PAGE && 'auto-draft' !== $this->_chart->post_status ) {
+			$tab = 'settings';
+		}
+
 		switch ( $tab ) {
 			case 'settings':
-				// changed by Ash/Upwork
 				$this->_handleDataAndSettingsPage();
 				break;
 			case 'type': // fall through.

classes/Visualizer/Render/Page/Data.php

@@ -401,15 +401,16 @@ class="dashicons dashicons-lock"></span>', '', apply_filters( 'visualizer_pro_up
 	 * @access protected
 	 */
 	protected function _renderToolbar() {
-		// changed by Ash/Upwork
-		echo '<div class="toolbar-div">';
-		echo '<a class="button button-large" href="', add_query_arg( 'tab', 'types' ), '">';
-		esc_html_e( 'Back', 'visualizer' );
-		echo '</a>';
-		echo '</div>';
+		// don't show back button at all.
+		// NOTE: We can't be selective on the post_status here because when a new chart reaches the settings screen, its status changes to publish.
+		if ( ! VISUALIZER_SKIP_CHART_TYPE_PAGE ) {
+			echo '<div class="toolbar-div">';
+			echo '<a class="button button-large" href="', add_query_arg( 'tab', 'types' ), '">';
+			esc_html_e( 'Back', 'visualizer' );
+			echo '</a>';
+			echo '</div>';
+		}
 		echo '<input type="submit" id="settings-button" class="button button-primary button-large push-right" value="', $this->button, '">';
-		echo '</div>';
-
 	}
 
 }

index.php

@@ -30,6 +30,8 @@
 	defined( 'VISUALIZER_PRO' ) || define( 'VISUALIZER_PRO', false );
 }
 // Added by Ash/Upwork
+define( 'VISUALIZER_SKIP_CHART_TYPE_PAGE', true );
+
 /**
  * Automatically loads classes for the plugin. Checks a namespace and loads only
  * approved classes.