← All changes | includes/frontend/wppm_public_projects_tasks.php +43 -6 5.0.6 → 6.0.6 View file →

		@@ -105,9 +105,9 @@
105	105	?> wppm_view_task_search_filter();
106	106	<?php }
107	107	}
108	108	if((isset($_REQUEST['task-id'])) && (!empty(sanitize_text_field(wp_unslash($_REQUEST['auth-code'] ))))){ ?>
109		- wppm_open_task(<?php echo esc_js(sanitize_text_field(wp_unslash($_REQUEST['task-id']))); ?>);
	109	+ wppm_open_task(<?php echo (intval(wp_unslash($_REQUEST['task-id']))); ?>);
110	110	<?php }
111	111	}
112	112	else{ ?>
113	113	wppm_task_sign_in();
		@@ -154,13 +154,23 @@
154	154	});
155	155	}
156	156
157	157	function wppm_apply_task_filter(){
158		- wppm_task_filter = jQuery('#wppm_task_filter').find(":selected").val();
159		- jQuery('#wppm_task_container').html(wppm_admin.loading_html);
160		- var dataform=new FormData(jQuery('#wppm_task_list_frm')[0]);
	158	+ wppm_task_filter = jQuery('#wppm_task_filter').find(":selected").val();
	159	+ var listFilters = {};
	160	+ listFilters.created_by = jQuery("#tb-created-by").val();
	161	+ listFilters.created_by = listFilters.created_by ? listFilters.created_by : [];
	162	+ listFilters.assigned = jQuery("#tb-assigned").val();
	163	+ listFilters.assigned = listFilters.assigned ? listFilters.assigned : [];
	164	+ listFilters.priority = jQuery("#tb-priority").val();
	165	+ listFilters.priority = listFilters.priority ? listFilters.priority : [];
	166	+ listFilters.start_date = jQuery("#tb-start-date").val() || "";
	167	+ listFilters.end_date = jQuery("#tb-end-date").val() || "";
	168	+ jQuery('#wppm_task_container').html(wppm_admin.loading_html);
	169	+ var dataform=new FormData(jQuery('#wppm_task_list_frm')[0]);
161	170	jQuery(document).trigger('wppm_apply_task_filter_dataform', [dataform]);
162	171	dataform.append("wppm_task_filter", wppm_task_filter);
	172	+ dataform.append("filters", JSON.stringify(listFilters));
163	173	dataform.append("action", 'wppm_get_task_list');
164	174	dataform.append("public_projects", '1');
165	175	<?php if(!empty($this->shortcode_attr['project'])){ ?>
166	176	dataform.append("wppm_project_attr","<?php echo esc_attr($this->shortcode_attr['project']); ?>");
		@@ -173,12 +183,23 @@
173	183	contentType: false
174	184	})
175	185	.done(function( response ) {
176	186	jQuery('#wppm_task_container').html(response);
	187	+ setListFilterCookie(listFilters);
	188	+ setTimeout(function(){
	189	+ syncUIWithFilters(listFilters);
	190	+ renderActiveFilters(listFilters);
	191	+ }, 100);
177	192	});
178	193	}
179	194
180	195	function wppm_tl_reset_filter(){
	196	+ // clear advanced filters + cookie BEFORE requesting the list,
	197	+ // otherwise this request still sends the stale tb_list_filters
	198	+ // cookie and the reset only takes effect on the next click
	199	+ setListFilterCookie({});
	200	+ resetFilters('list');
	201	+
181	202	jQuery('#wppm_task_container').html(wppm_admin.loading_html);
182	203	var dataform=new FormData(jQuery('#wppm_task_list_frm')[0]);
183	204	dataform.append("action", 'wppm_get_task_list');
184	205	dataform.append("wppm_task_filter", 'all');
		@@ -196,9 +217,9 @@
196	217	type: 'POST',
197	218	data: dataform,
198	219	processData: false,
199	220	contentType: false
200		- })
	221	+ })
201	222	.done(function( response ) {
202	223	jQuery('#wppm_task_container').html(response);
203	224	});
204	225	}
		@@ -234,8 +255,9 @@
234	255	var dataform=new FormData(jQuery('#wppm_view_project_task')[0]);
235	256	jQuery(document).trigger('wppm_display_grid_view_dataform', [dataform]);
236	257	dataform.append("action", 'wppm_get_task_list_card_view');
237	258	dataform.append("task_search", task_search);
	259	+ dataform.append("wppm_task_filter",wppm_task_filter);
238	260	dataform.append("public_projects", '1');
239	261	<?php if(!empty($this->shortcode_attr['project'])){ ?>
240	262	dataform.append("wppm_project_attr","<?php echo esc_attr($this->shortcode_attr['project']); ?>");
241	263	<?php } ?>
		@@ -323,8 +345,23 @@
323	345	});
324	346	}
325	347
326	348	function wppm_tl_reset_grid_view_filter(){
	349	+ // clear advanced filters + cookie BEFORE requesting the list,
	350	+ // otherwise this request still sends the stale tb_filters cookie
	351	+ // and the advanced filters never actually get reset
	352	+ jQuery("#tb-created-by").val(null).trigger("change");
	353	+ jQuery("#tb-assigned").val(null).trigger("change");
	354	+ jQuery("#tb-priority").val(null).trigger("change");
	355	+ jQuery("#tb-start-date").val("");
	356	+ jQuery("#tb-end-date").val("");
	357	+ jQuery("#tb-advanced-panel").removeClass("tb-open");
	358	+ jQuery("#tb-backdrop").removeClass("active");
	359	+ jQuery("#tb-active-filters").html('');
	360	+ window.filters = { created_by: [], assigned: [], priority: [], start_date: "", end_date: "" };
	361	+ document.cookie = "tb_filters=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
	362	+ window.localStorage.removeItem('wppm_task_filter');
	363	+
327	364	jQuery('#wppm_task_container').html(wppm_admin.loading_html);
328	365	var dataform=new FormData(jQuery('#wppm_view_project_task')[0]);
329	366	jQuery(document).trigger('wppm_tl_reset_grid_view_filter_dataform', [dataform]);
330	367	dataform.append("action", 'wppm_view_project_tasks');
		@@ -342,9 +379,9 @@
342	379	type: 'POST',
343	380	data: dataform,
344	381	processData: false,
345	382	contentType: false
346		- })
	383	+ })
347	384	.done(function( response ) {
348	385	jQuery('#wppm_task_container').html(response);
349	386	});
350	387	}