Skip to content

Added a button to the Story Budget date change option #509

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

Open
raduconst wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Added a button to the Story Budget date change option #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d3c5278
Added a button to the Story Budget date change
Apr 15, 2019
234b8b1
Relocate Story Budget Today button to beside date field
dchymko Oct 31, 2019
b292d20
reset whitespace changes
dchymko Oct 31, 2019
5341ca9
reformat with tabs
dchymko Oct 31, 2019
e30020b
Updates to support date format
Dec 14, 2019
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
2 changes: 2 additions & 0 deletions modules/story-budget/lib/story-budget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jQuery(document).ready(function($) {
$('h2 form .form-value').hide();
$('h2 form input').show();
$('h2 form a.change-date-cancel').show();
$('h2 form span.or-between-buttons').show();
return false;
});

Expand All @@ -45,6 +46,7 @@ jQuery(document).ready(function($) {
$('h2 form .form-value').show();
$('h2 form input').hide();
$('h2 form a.change-date').show();
$('h2 form span.or-between-buttons').hide();
return false;
});
});
18 changes: 13 additions & 5 deletions modules/story-budget/story-budget.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,20 @@ function register_term_columns() {
*/
function handle_form_date_range_change() {

if ( !isset( $_POST['ef-story-budget-range-submit'], $_POST['ef-story-budget-number-days'], $_POST['ef-story-budget-start-date'] ) )
if ( !isset( $_POST['ef-story-budget-number-days'], $_POST['ef-story-budget-start-date'] ) &&
( !isset( $_POST['ef-story-budget-range-submit'] ) || !isset( $_POST['ef-story-budget-today-submit'] ) ) )
return;

if ( !wp_verify_nonce( $_POST['nonce'], 'change-date' ) )
wp_die( $this->module->messages['nonce-failed'] );

$current_user = wp_get_current_user();
$user_filters = $this->get_user_meta( $current_user->ID, self::usermeta_key_prefix . 'filters', true );
$user_filters['start_date'] = date( 'Y-m-d', strtotime( $_POST['ef-story-budget-start-date'] ) );
if ( isset( $_POST['ef-story-budget-today-submit'] ) ) {
$user_filters['start_date'] = current_time( 'Y-m-d' );
} else {
$user_filters['start_date'] = date_i18n( 'Y-m-d', strtotime( $_POST['ef-story-budget-start-date'] ) );
}
$user_filters['number_days'] = (int)$_POST['ef-story-budget-number-days'];
if ( $user_filters['number_days'] <= 1 )
$user_filters['number_days'] = 1;
Expand Down Expand Up @@ -322,11 +327,14 @@ function story_budget() {
function story_budget_time_range() {

$output = '<form method="POST" action="' . menu_page_url( $this->module->slug, false ) . '">';

$start_date_value = '<input type="text" id="ef-story-budget-start-date" name="ef-story-budget-start-date"'
. ' size="10" class="date-pick" value="'
. esc_attr( date_i18n( get_option( 'date_format' ), strtotime( $this->user_filters['start_date'] ) ) ) . '" /><span class="form-value">';

. esc_attr( date_i18n( get_option( 'date_format' ), strtotime( $this->user_filters[ 'start_date' ] ) ) ) . '" />'
. '&nbsp;<input id="ef-story-budget-today-submit" name="ef-story-budget-today-submit" type="submit"'
. 'class="button-secondary" value="' . __( 'Today', 'edit-flow' ) . '" />'
. '<span class="form-value">';

$start_date_value .= esc_html( date_i18n( get_option( 'date_format' ), strtotime( $this->user_filters['start_date'] ) ) );
$start_date_value .= '</span>';

Expand Down