Skip to content

Commit

Permalink
Buttons on recurring projects and tasks page were incorrectly redirec…
Browse files Browse the repository at this point in the history 
…ting to the Settings tab. Recurring tab was not receiving the active style when it was the active tab.
  • Loading branch information
@ScottDeLuzio
ScottDeLuzio committed Sep 18, 2019
1 parent 3e9dcdc commit 319b8fe
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion includes/wcs-recurring-entries-delete.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
}
?>
<div class="wrap">
<h2><?php _e( 'Delete Entry', 'wp-crm-system' ); ?> - <a href="admin.php?page=wpcrm-settings&tab=settings&subtab=recurring-entries" class="button-secondary"><?php _e( 'Cancel - Go Back', 'wp-crm-system' ); ?></a></h2>
<h2><?php _e( 'Delete Entry', 'wp-crm-system' ); ?> - <a href="admin.php?page=wpcrm-settings&tab=recurring&subtab=recurring-entries" class="button-secondary"><?php _e( 'Cancel - Go Back', 'wp-crm-system' ); ?></a></h2>
<form method="post" action="" class="wp_crm_system_recurring_entries_form">
<?php $entry = $wpdb->get_row("SELECT * FROM " . $wpcrm_system_recurring_db_name . " WHERE id='" . $_GET['entry_id'] . "';"); ?>
<p><?php _e( 'Recurring entry deletion is permanent and cannot be undone. No further recurring entries will be created for this entry.', 'wp-crm-system' ); ?></p>
Expand Down
2 changes: 1 addition & 1 deletion includes/wcs-recurring-entries-edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
});
</script>
<div class="wrap">
<h2><?php _e( 'Edit Recurring Entry', 'wp-crm-system' ); ?> - <a href="admin.php?page=wpcrm-settings&tab=settings&subtab=recurring-entries" class="button-secondary"><?php _e( 'Cancel - Go Back', 'wp-crm-system' ); ?></a></h2>
<h2><?php _e( 'Edit Recurring Entry', 'wp-crm-system' ); ?> - <a href="admin.php?page=wpcrm-settings&tab=recurring&subtab=recurring-entries" class="button-secondary"><?php _e( 'Cancel - Go Back', 'wp-crm-system' ); ?></a></h2>

<form method="post" action="" class="wp_crm_system_recurring_entry_form">
<?php
Expand Down
10 changes: 5 additions & 5 deletions includes/wcs-recurring-entries.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
function wpcrm_system_system_recurring_tab() {
//Get current dashboard tab name
global $wpcrm_active_tab; ?>
<a class="nav-tab <?php echo $wpcrm_active_tab == 'recurring' ? 'current' : ''; ?>" href="<?php echo admin_url( 'admin.php?page=wpcrm-settings&tab=recurring' ); ?>"><?php _e( 'Recurring', 'wp-crm-system' ); ?> </a>
<a class="nav-tab <?php echo $wpcrm_active_tab == 'recurring' ? 'nav-tab-active' : ''; ?>" href="<?php echo admin_url( 'admin.php?page=wpcrm-settings&tab=recurring' ); ?>"><?php _e( 'Recurring', 'wp-crm-system' ); ?> </a>
<?php }
add_action( 'wpcrm_system_settings_tab', 'wpcrm_system_system_recurring_tab', 3 );

Expand All @@ -19,7 +19,7 @@ function wpcrm_system_recurring_entries(){
<h2><?php _e( 'Recurring Projects and Tasks', 'wp-crm-system' ); ?></h2>

<p>
<a class="button-primary" href="admin.php?page=wpcrm-settings&tab=settings&subtab=recurring-entries&action=add_new"><?php _e( 'Add New Recurring Entry', 'wp-crm-system' ); ?></a>
<a class="button-primary" href="admin.php?page=wpcrm-settings&tab=recurring&subtab=recurring-entries&action=add_new"><?php _e( 'Add New Recurring Entry', 'wp-crm-system' ); ?></a>
</p>

<table class="wp-list-table widefat fixed posts" id="wp_crm_system_recurring_entries_table">
Expand Down Expand Up @@ -102,8 +102,8 @@ function wpcrm_system_recurring_entries(){
<td><?php echo $end_date; ?></td>
<td><?php echo $entry->number_per_frequency . ' ' . $frequency[$entry->frequency]; ?></td>
<td>
<a class="button-secondary" href="admin.php?page=wpcrm-settings&tab=settings&subtab=recurring-entries&action=edit&entry_id=<?php echo $entry->id; ?>"><?php _e( 'Edit', 'wp-crm-system' ); ?></a>
<a class="button-secondary" href="admin.php?page=wpcrm-settings&tab=settings&subtab=recurring-entries&action=delete&entry_id=<?php echo $entry->id; ?>"><?php _e( 'Delete', 'wp-crm-system' ); ?></a>
<a class="button-secondary" href="admin.php?page=wpcrm-settings&tab=recurring&subtab=recurring-entries&action=edit&entry_id=<?php echo $entry->id; ?>"><?php _e( 'Edit', 'wp-crm-system' ); ?></a>
<a class="button-secondary" href="admin.php?page=wpcrm-settings&tab=recurring&subtab=recurring-entries&action=delete&entry_id=<?php echo $entry->id; ?>"><?php _e( 'Delete', 'wp-crm-system' ); ?></a>
</td>
</tr>
<?php }
Expand All @@ -116,7 +116,7 @@ function wpcrm_system_recurring_entries(){
</table>

<p class="submit">
<a class="button-primary" href="admin.php?page=wpcrm-settings&tab=settings&subtab=recurring-entries&action=add_new"><?php _e( 'Add New Recurring Entry', 'wp-crm-system' ); ?></a>
<a class="button-primary" href="admin.php?page=wpcrm-settings&tab=recurring&subtab=recurring-entries&action=add_new"><?php _e( 'Add New Recurring Entry', 'wp-crm-system' ); ?></a>
</p>
</div><!--end wrap-->
<?php }
Expand Down
13 changes: 8 additions & 5 deletions readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
Contributors: scott.deluzio
Tags: WordPress CRM, Free CRM for WordPress, CRM, Free WordPress CRM, CRM for WordPress, gdpr
Requires at least: 3.3.0
Tested up to: 5.2.2
Stable tag: 3.1.0
Tested up to: 5.2.3
Stable tag: 3.1.1
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -91,6 +91,9 @@ Absolutely. There are inexpensive extensions that allow you to import as little
Your data is only accessible through the WordPress CRM dashboard. None of it will be accessible through the public facing portion of your website unless you are using our GDPR features (see above). This allows you to provide access to as few or as many people as you need to.

== Changelog ==
= 3.1.1 =
* Fix: Buttons on recurring projects and tasks page were incorrectly redirecting to the Settings tab.
* Fix: Recurring tab was receiving the "active" style when it was the active tab.
= 3.1.0 =
* New: Added an import and export feature for WP-CRM System settings. This will allow users to export settings to import into another site or use as a backup for their existing site.
* Update: Updated translatable POT file for new and updated text strings.
Expand Down Expand Up @@ -357,6 +360,6 @@ Your data is only accessible through the WordPress CRM dashboard. None of it wil
* Initial Release

== Upgrade Notice ==
= 3.1.0 =
* New: Added an import and export feature for WP-CRM System settings. This will allow users to export settings to import into another site or use as a backup for their existing site.
* Update: Updated translatable POT file for new and updated text strings.
= 3.1.1 =
* Fix: Buttons on recurring projects and tasks page were incorrectly redirecting to the Settings tab.
* Fix: Recurring tab was receiving the "active" style when it was the active tab.
4 changes: 2 additions & 2 deletions wp-crm-system.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Plugin Name: WP-CRM System
Plugin URI: https://www.wp-crm.com
Description: A complete CRM for WordPress
Version: 3.1.0
Version: 3.1.1
Author: Scott DeLuzio
Author URI: https://www.wp-crm.com
Text Domain: wp-crm-system
Expand Down Expand Up @@ -34,7 +34,7 @@ function wp_crm_plugin_init() {
define( 'WP_CRM_SYSTEM', __FILE__ );
}
if ( ! defined( 'WP_CRM_SYSTEM_VERSION' ) ) {
define( 'WP_CRM_SYSTEM_VERSION', '3.1.0' );
define( 'WP_CRM_SYSTEM_VERSION', '3.1.1' );
}
if( ! defined( 'WP_CRM_SYSTEM_URL' ) ) {
define( 'WP_CRM_SYSTEM_URL', plugins_url( '', __FILE__ ) );
Expand Down

0 comments on commit 319b8fe

Please sign in to comment.