Skip to content

Fix syncing status #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 27, 2020
Merged

Fix syncing status #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
412a38f
Add method to check is auto sync is enabled
Jul 22, 2020
f11d629
Leverage the new method to check if auto sync is enabled
Jul 22, 2020
b7a7ac6
Syncing flag should only be set if auto sync is enabled
Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-settings-page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,4 +913,19 @@ public function set_active_page( $page_slug ) {
$this->active_page = $page_slug;
}
}

/**
* Checks if auto sync feature is enabled.
*
* @return bool
*/
public function is_auto_sync_enabled() {
$settings = $this->get_config();

if ( ! empty( $settings['sync_media']['auto_sync'] ) && 'on' === $settings['sync_media']['auto_sync'] ) {
return true;
}

return false;
Comment on lines +925 to +929
Copy link
Contributor

@dugajean dugajean Jul 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could also be:

Suggested change
if ( ! empty( $settings['sync_media']['auto_sync'] ) && 'on' === $settings['sync_media']['auto_sync'] ) {
return true;
}
return false;
return ! empty( $settings['sync_media']['auto_sync'] ) && 'on' === $settings['sync_media']['auto_sync'];

}
}
2 changes: 1 addition & 1 deletion cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-sync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public function is_synced( $post_id ) {
return true;
}

if ( apply_filters( 'cloudinary_flag_sync', '__return_false' ) && ! get_post_meta( $post_id, Sync::META_KEYS['downloading'], true ) ) {
if ( $this->plugin->components['settings']->is_auto_sync_enabled() && apply_filters( 'cloudinary_flag_sync', '__return_false' ) && ! get_post_meta( $post_id, Sync::META_KEYS['downloading'], true ) ) {
update_post_meta( $post_id, Sync::META_KEYS['syncing'], true );
}

Expand Down
2 changes: 1 addition & 1 deletion cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-upload-sync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public function handle_bulk_actions( $location, $action, $post_ids ) {
* @return bool
*/
public function auto_sync_enabled( $enabled, $post_id ) {
if ( isset( $this->plugin->config['settings']['sync_media']['auto_sync'] ) && 'on' === $this->plugin->config['settings']['sync_media']['auto_sync'] ) {
if ( $this->plugin->components['settings']->is_auto_sync_enabled() ) {
$enabled = true;
}

Expand Down
5 changes: 1 addition & 4 deletions ...e-management-and-manipulation-in-the-cloud-cdn/ui-definitions/tabs/sync-media-content.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
* @package Cloudinary
*/

$autosync = false;
if ( isset( $this->plugin->config['settings']['sync_media']['auto_sync'] ) && 'on' === $this->plugin->config['settings']['sync_media']['auto_sync'] ) {
$autosync = true;
}
$autosync = $this->plugin->components['settings']->is_auto_sync_enabled();
?>
<?php if ( ! empty( $this->plugin->config['connect'] ) ) : ?>
<div class="settings-tab-section-card">
Expand Down