| @@ -3,8 +3,9 @@ | ||
| 3 | 3 | exit; // Exit if accessed directly |
| 4 | 4 | } |
| 5 | 5 | global $current_user,$wpdb,$wppmfunction; |
| 6 | 6 | $proj_id = isset($_POST['proj_id']) ? intval(sanitize_text_field(wp_unslash($_POST['proj_id']))) : 0 ; |
| 7 | +$current_project_id = isset($_POST['project_id']) ? intval(sanitize_text_field(wp_unslash($_POST['project_id']))) : 0 ; | |
| 7 | 8 | $orderby_prio_sql = (sanitize_sql_orderby( "name" )); |
| 8 | 9 | $cu_id = absint($current_user->ID); |
| 9 | 10 | $wppm_rich_text_editor = get_option('wppm_rich_text_editor'); |
| 10 | 11 | $wppm_toolbar_actions = get_option('wppm_toolbar_actions'); |
| @@ -72,18 +73,23 @@ | ||
| 72 | 73 | $style = "display:none;"; |
| 73 | 74 | } |
| 74 | 75 | $style = apply_filters('wppm_add_new_task_btn_style',$style); |
| 75 | 76 | ?> |
| 76 | - <span onclick="wppm_add_new_task()" class="wppm_add_new_task_btn" title="Create Task" style=<?php echo esc_attr($style);?>><img src="<?php echo esc_url( WPPM_PLUGIN_URL . 'asset/images/plus.svg'); ?>" alt="plus-icon"></span> | |
| 77 | + <span onclick="wppm_add_new_task('',<?php echo esc_attr($current_project_id); ?>)" class="wppm_add_new_task_btn" title="Create Task" style=<?php echo esc_attr($style);?>><img src="<?php echo esc_url( WPPM_PLUGIN_URL . 'asset/images/plus.svg'); ?>" alt="plus-icon"></span> | |
| 77 | 78 | <?php } ?> |
| 78 | - <?php if($proj_id==0) { | |
| 79 | - $tstyle = "display:inline;"; | |
| 80 | - $tstyle = apply_filters('wppm_task_list_btn_style',$tstyle); | |
| 81 | - ?> | |
| 82 | - <span class="wppm-task-list-btn" title="Task List" onclick="wppm_get_task_list()" style="<?php echo esc_attr($tstyle);?>"><img src="<?php echo esc_url( WPPM_PLUGIN_URL . 'asset/images/list.svg'); ?>" alt="list-icon"></span> | |
| 83 | - <?php } else { ?> | |
| 84 | - <span class="wppm-task-list-btn" id="wppm_task_list_btn" title="Task List" onclick="wppm_get_project_tasks(<?php echo esc_attr($proj_id)?>)"><img src="<?php echo esc_url( WPPM_PLUGIN_URL . 'asset/images/list.svg'); ?>" alt="list-icon"></span> | |
| 85 | - <?php } | |
| 79 | + <?php | |
| 80 | + if(!empty($current_project_id)){ | |
| 81 | + ?><span class="wppm-task-list-btn" title="Task List" onclick="wppm_get_project_tasks_kanban_view( <?php echo esc_attr($current_project_id); ?>)"><img src="<?php echo esc_url( WPPM_PLUGIN_URL . 'asset/images/list.svg'); ?>" alt="list-icon"></span><?php | |
| 82 | + }else{ | |
| 83 | + if($proj_id==0) { | |
| 84 | + $tstyle = "display:inline;"; | |
| 85 | + $tstyle = apply_filters('wppm_task_list_btn_style',$tstyle); | |
| 86 | + ?> | |
| 87 | + <span class="wppm-task-list-btn" title="Task List" onclick="wppm_get_task_list()" style="<?php echo esc_attr($tstyle);?>"><img src="<?php echo esc_url( WPPM_PLUGIN_URL . 'asset/images/list.svg'); ?>" alt="list-icon"></span> | |
| 88 | + <?php } else { ?> | |
| 89 | + <span class="wppm-task-list-btn" id="wppm_task_list_btn" title="Task List" onclick="wppm_get_project_tasks(<?php echo esc_attr($proj_id)?>)"><img src="<?php echo esc_url( WPPM_PLUGIN_URL . 'asset/images/list.svg'); ?>" alt="list-icon"></span> | |
| 90 | + <?php } | |
| 91 | + } | |
| 86 | 92 | do_action('wppm_after_add_new_task_button',$style);?> |
| 87 | 93 | </div> |
| 88 | 94 | </div> |
| 89 | 95 | <div id='wppm_task_frm_field_container'> |
| @@ -102,28 +108,36 @@ | ||
| 102 | 108 | </b> |
| 103 | 109 | </span><br> |
| 104 | 110 | <select searchable="search here" onchange="wppm_select_project()" class="form-control" size="40" name="wppm_task_project" id="wppm_task_project"> |
| 105 | 111 | <?php |
| 106 | - if(!empty($projects)){ | |
| 107 | - foreach($projects as $proj) { | |
| 108 | - $project_id = esc_sql($proj->id); | |
| 109 | - if($current_user->has_cap('manage_options') || $wppmfunction->has_permission('add_new_task',0) || $wppm_current_user_capability=='wppm_admin'){ | |
| 110 | - ?> | |
| 111 | - <option value="<?php echo esc_attr($proj->id)?>"><?php echo esc_html($proj->project_name);?></option><?php | |
| 112 | - } | |
| 113 | - else{ | |
| 114 | - $project_id = absint( $project_id ); | |
| 115 | - $cu_id = absint( $cu_id ); | |
| 116 | - $project_user_role = $wpdb->get_var( $wpdb->prepare("SELECT role_id FROM {$wpdb->prefix}wppm_project_users WHERE proj_id = %d AND user_id = %d",$project_id, $cu_id)); | |
| 117 | - $project_users = $proj->users; | |
| 118 | - $project_users_arr = explode(',',(string)$project_users); | |
| 119 | - $project_creator_id = $wpdb->get_var( $wpdb->prepare( "SELECT created_by FROM {$wpdb->prefix}wppm_project WHERE created_by = %d AND id = %d",$cu_id,$project_id )); | |
| 120 | - if(((!empty($project_user_role)) && ($project_user_role == 1) && in_array($current_user->ID,$project_users_arr)) || ($project_creator_id!="")){ | |
| 112 | + if($current_project_id != 0){ | |
| 113 | + $current_project_name = $wpdb->get_var( $wpdb->prepare( "SELECT project_name FROM {$wpdb->prefix}wppm_project WHERE id = %d",$current_project_id)); | |
| 114 | + if($current_project_id && $current_project_name){ | |
| 115 | + echo '<option value="'.esc_attr($current_project_id).'" selected="selected">'.esc_html($current_project_name).'</option>'; | |
| 116 | + } | |
| 117 | + } | |
| 118 | + else{ | |
| 119 | + if(!empty($projects)){ | |
| 120 | + foreach($projects as $proj) { | |
| 121 | + $project_id = esc_sql($proj->id); | |
| 122 | + if($current_user->has_cap('manage_options') || $wppmfunction->has_permission('add_new_task',0) || $wppm_current_user_capability=='wppm_admin'){ | |
| 121 | 123 | ?> |
| 122 | - <option value="<?php echo esc_attr($proj->id)?>"><?php echo esc_html($proj->project_name);?></option> | |
| 123 | - <?php } | |
| 124 | + <option value="<?php echo esc_attr($proj->id)?>"><?php echo esc_html($proj->project_name);?></option><?php | |
| 125 | + } | |
| 126 | + else{ | |
| 127 | + $project_id = absint( $project_id ); | |
| 128 | + $cu_id = absint( $cu_id ); | |
| 129 | + $project_user_role = $wpdb->get_var( $wpdb->prepare("SELECT role_id FROM {$wpdb->prefix}wppm_project_users WHERE proj_id = %d AND user_id = %d",$project_id, $cu_id)); | |
| 130 | + $project_users = $proj->users; | |
| 131 | + $project_users_arr = explode(',',(string)$project_users); | |
| 132 | + $project_creator_id = $wpdb->get_var( $wpdb->prepare( "SELECT created_by FROM {$wpdb->prefix}wppm_project WHERE created_by = %d AND id = %d",$cu_id,$project_id )); | |
| 133 | + if(((!empty($project_user_role)) && ($project_user_role == 1) && in_array($current_user->ID,$project_users_arr)) || ($project_creator_id!="")){ | |
| 134 | + ?> | |
| 135 | + <option value="<?php echo esc_attr($proj->id)?>"><?php echo esc_html($proj->project_name);?></option> | |
| 136 | + <?php } | |
| 137 | + } | |
| 124 | 138 | } |
| 125 | - } | |
| 139 | + } | |
| 126 | 140 | }?> |
| 127 | 141 | </select> |
| 128 | 142 | </div> |
| 129 | 143 | </div> |
| @@ -306,9 +320,9 @@ | ||
| 306 | 320 | } |
| 307 | 321 | |
| 308 | 322 | function wppm_select_project(){ |
| 309 | 323 | jQuery('.wppm_filter_display_element').hide(); |
| 310 | - <?php do_action('wppm_display_cf_by_project') ?> | |
| 324 | + <?php do_action('wppm_display_cf_by_project',$proj_id) ?> | |
| 311 | 325 | } |
| 312 | 326 | |
| 313 | 327 | function wppm_create_task(e){ |
| 314 | 328 | if(!jQuery('#wppm_task_name').val()){ |
| @@ -343,12 +357,14 @@ | ||
| 343 | 357 | data: dataform, |
| 344 | 358 | processData: false, |
| 345 | 359 | contentType: false |
| 346 | 360 | }) .done(function (response_str) { |
| 347 | - <?php if($wppm_task_list_view==1){ ?> | |
| 361 | + <?php if($current_project_id != 0){ ?> | |
| 362 | + wppm_get_project_tasks_kanban_view(<?php echo (int)$current_project_id; ?>); | |
| 363 | +<?php } elseif($wppm_task_list_view == 1){ ?> | |
| 348 | 364 | wppm_get_task_list(); |
| 349 | - <?php } elseif($wppm_task_list_view==0){ ?> | |
| 365 | +<?php } elseif($wppm_task_list_view == 0){ ?> | |
| 350 | 366 | wppm_display_grid_view(); |
| 351 | - <?php } ?> | |
| 367 | +<?php } ?> | |
| 352 | 368 | }); |
| 353 | 369 | } |
| 354 | 370 | </script> |
