Merge pull request #250 from contactashish13/issue-243

add revision support

Author: rodica-andronache

classes/Visualizer/Module.php

@@ -63,6 +63,10 @@ public function __construct( Visualizer_Plugin $plugin ) {
 
 		$this->_wpdb = $wpdb;
 		$this->_plugin = $plugin;
+
+		$this->_addFilter( Visualizer_Plugin::FILTER_UNDO_REVISIONS, 'undoRevisions', 10, 2 );
+		$this->_addFilter( Visualizer_Plugin::FILTER_HANDLE_REVISIONS, 'handleExistingRevisions', 10, 2 );
+
 	}
 
 	/**
@@ -328,17 +332,21 @@ private function _getHTML( $rows ) {
 	 *
 	 * @return bool If any revisions were found.
 	 */
-	protected function undoRevisions( $chart_id, $restore = false ) {
+	public final function undoRevisions( $chart_id, $restore = false ) {
+		do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'undoRevisions for %d with%s restore', $chart_id, ( $restore ? '' : 'out' ) ), 'debug', __FILE__, __LINE__ );
+
 		$revisions = wp_get_post_revisions( $chart_id, array( 'order' => 'ASC' ) );
-		if ( $revisions ) {
+		if ( count( $revisions ) > 1 ) {
 			$revision_ids = array_keys( $revisions );
 
+			do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'found %d revisions = %s', count( $revisions ), print_r( $revision_ids, true ) ), 'debug', __FILE__, __LINE__ );
+
 			// when we restore, a new revision is likely to be created. so, let's disable revisions for the time being.
 			add_filter( 'wp_revisions_to_keep', '__return_false' );
 
 			if ( $restore ) {
 				// restore to the oldest one i.e. the first one.
-				wp_restore_post_revision( $revision_ids[0] );
+				wp_restore_post_revision( array_shift( $revision_ids ) );
 			}
 
 			// delete all revisions.
@@ -354,9 +362,12 @@ protected function undoRevisions( $chart_id, $restore = false ) {
 	/**
 	 * If existing revisions exist for the chart, restore the earliest version and then create a new revision to initiate editing.
 	 */
-	protected function handleExistingRevisions( $chart_id, $chart ) {
+	public final function handleExistingRevisions( $chart_id, $chart ) {
+		do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'handleExistingRevisions for %d', $chart_id ), 'debug', __FILE__, __LINE__ );
+
 		// undo revisions.
 		$revisions_found    = $this->undoRevisions( $chart_id, true );
+
 		// create revision for the edit action.
 		wp_save_post_revision( $chart_id );
 

classes/Visualizer/Module/Chart.php

@@ -267,7 +267,7 @@ public function renderChartPages() {
 		$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 && 'visualizer' === $_GET['tab'] ) {
+		if ( VISUALIZER_SKIP_CHART_TYPE_PAGE && 'auto-draft' !== $this->_chart->post_status && ( ! empty( $_GET['tab'] ) && 'visualizer' === $_GET['tab'] ) ) {
 			$tab = 'settings';
 		}
 

classes/Visualizer/Module/Frontend.php

@@ -197,6 +197,11 @@ public function renderChart( $atts ) {
 			return '';
 		}
 
+		// in case revisions exist.
+		if ( true === ( $revisions = $this->undoRevisions( $chart->ID, true ) ) ) {
+			$chart = get_post( $chart->ID );
+		}
+
 		$id = 'visualizer-' . $atts['id'];
 		$defaultClass   = 'visualizer-front';
 		$class = apply_filters( Visualizer_Plugin::FILTER_CHART_WRAPPER_CLASS, $atts['class'], $atts['id'] );

classes/Visualizer/Plugin.php

@@ -62,6 +62,8 @@ class Visualizer_Plugin {
 	const FILTER_GET_CHART_SERIES = 'visualizer-get-chart-series';
 	const FILTER_GET_CHART_DATA = 'visualizer-get-chart-data';
 	const FILTER_GET_CHART_SETTINGS = 'visualizer-get-chart-settings';
+	const FILTER_UNDO_REVISIONS = 'visualizer-undo-revisions';
+	const FILTER_HANDLE_REVISIONS = 'visualizer-handle-revisions';
 
 	const CF_CHART_URL = 'visualizer-chart-url';
 	const CF_CHART_SCHEDULE = 'visualizer-chart-schedule';
@@ -97,6 +99,9 @@ class Visualizer_Plugin {
 	 * @access private
 	 */
 	private function __construct() {
+		if ( VISUALIZER_DEBUG ) {
+			add_action( 'themeisle_log_event', array( $this, 'themeisle_log_event_debug' ), 10, 5 );
+		}
 	}
 
 	/**
@@ -184,4 +189,14 @@ public function setModule( $class ) {
 	private function __clone() {
 	}
 
+	/**
+	 * For local testing, overrides the 'themeisle_log_event' hook and redirects to error.log.
+	 */
+	final function themeisle_log_event_debug( $name, $message, $type, $file, $line ) {
+		if ( Visualizer_Plugin::NAME !== $name ) {
+			return;
+		}
+		error_log( sprintf( '%s (%s): %s in %s:%s', $name, $type, $message, $file, $line ) );
+	}
+
 }

classes/Visualizer/Render/Page/Data.php

@@ -314,6 +314,10 @@ private function getPermissionsLink( $id ) {
 	 * @access private
 	 */
 	private function permissionsSidebar() {
+		// ignore for unit tests because Travis throws the error "Indirect modification of overloaded property Visualizer_Render_Page_Data::$permissions has no effect".
+		if ( defined( 'WP_TESTS_DOMAIN' ) ) {
+			return;
+		}
 		Visualizer_Render_Sidebar::_renderGroupStart(
 			esc_html__( 'Who can see this chart?', 'visualizer' ) . '<span
 										class="dashicons dashicons-lock"></span>', '', apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'chart-permissions' )

index.php

@@ -75,13 +75,17 @@ function visualizer_launch() {
 	if ( ! defined( 'VISUALIZER_CSV_ENCLOSURE' ) ) {
 		define( 'VISUALIZER_CSV_ENCLOSURE', '"' );
 	}
+	if ( ! defined( 'VISUALIZER_DEBUG' ) ) {
+		define( 'VISUALIZER_DEBUG', false );
+	}
+
 	// instantiate the plugin
 	$plugin = Visualizer_Plugin::instance();
 	// set general modules
 	$plugin->setModule( Visualizer_Module_Setup::NAME );
 	$plugin->setModule( Visualizer_Module_Sources::NAME );
 	$plugin->setModule( Visualizer_Module_Chart::NAME );
-	if ( is_admin() ) {
+	if ( is_admin() || defined( 'WP_TESTS_DOMAIN' ) ) {
 		// set admin modules
 		$plugin->setModule( Visualizer_Module_Admin::NAME );
 	} else {