← All changes
|
includes/admin/projects/open_project/wppm_get_project_tasks.php
+9
-6
5.0.4
→
6.0.6
View file →
| @@ -10,9 +10,9 @@ | ||
| 10 | 10 | $wppm_task_time = get_option('wppm_task_time'); |
| 11 | 11 | $wppm_current_user_capability = get_user_meta( $current_user->ID, 'wppm_capability', true ); |
| 12 | 12 | if($current_user->has_cap('manage_options') || $wppm_current_user_capability=='wppm_admin'){ |
| 13 | 13 | $query = $wpdb->prepare( |
| 14 | - "SELECT * FROM {$wpdb->prefix}wppm_task WHERE project = %d", | |
| 14 | + "SELECT * FROM {$wpdb->prefix}wppm_task WHERE project = %d AND (parent_task_id = 0 OR parent_task_id IS NULL)", | |
| 15 | 15 | $project_id |
| 16 | 16 | ); |
| 17 | 17 | } else{ |
| 18 | 18 | $query = $wpdb->prepare( "SELECT Task.* FROM {$wpdb->prefix}wppm_task AS Task |
| @@ -18,9 +18,9 @@ | ||
| 18 | 18 | $query = $wpdb->prepare( "SELECT Task.* FROM {$wpdb->prefix}wppm_task AS Task |
| 19 | 19 | LEFT JOIN {$wpdb->prefix}wppm_project proj ON Task.project = proj.id |
| 20 | 20 | LEFT JOIN {$wpdb->prefix}wppm_project_users proj_users ON Task.project = proj_users.proj_id |
| 21 | 21 | LEFT JOIN {$wpdb->prefix}wppm_project_meta proj_meta ON Task.project = proj_meta.project_id |
| 22 | - WHERE Task.project = %d AND (FIND_IN_SET(%d, Task.users) > 0 OR Task.created_by = %d OR ( proj_users.user_id = %d AND proj_users.role_id = 1 AND FIND_IN_SET(%d, proj.users) > 0 ) OR ( proj_meta.meta_key = 'public_project' AND proj_meta.meta_value = 1 ) OR proj.created_by = %d ) GROUP BY Task.id", | |
| 22 | + WHERE Task.project = %d AND (Task.parent_task_id = 0 OR Task.parent_task_id IS NULL) AND (FIND_IN_SET(%d, Task.users) > 0 OR Task.created_by = %d OR ( proj_users.user_id = %d AND proj_users.role_id = 1 AND FIND_IN_SET(%d, proj.users) > 0 ) OR ( proj_meta.meta_key = 'public_project' AND proj_meta.meta_value = 1 ) OR proj.created_by = %d ) GROUP BY Task.id", | |
| 23 | 23 | $project_id,$cu_id, $cu_id,$cu_id,$cu_id, $cu_id ); |
| 24 | 24 | } |
| 25 | 25 | $query = apply_filters('wppm_get_project_tasks_query',$query,$project_id); |
| 26 | 26 | $tasks = $wpdb->get_results($query); |
| @@ -84,12 +84,15 @@ | ||
| 84 | 84 | if(!empty($users)){ |
| 85 | 85 | foreach($users as $user){ |
| 86 | 86 | $i++; |
| 87 | 87 | if( $i <= 4 ){ |
| 88 | - $userdata = get_userdata( $user ); ?> | |
| 89 | - <a href="#" title="<?php echo esc_attr($userdata->display_name) ?>"> | |
| 90 | - <?php echo (get_avatar($userdata->ID, 25, "mysteryman"))?> | |
| 91 | - </a> <?php | |
| 88 | + $userdata = get_userdata( $user ); | |
| 89 | + if($userdata){ | |
| 90 | + ?> | |
| 91 | + <a href="#" title="<?php echo esc_attr($userdata->display_name) ?>"> | |
| 92 | + <?php echo (get_avatar($userdata->ID, 25, "mysteryman"))?> | |
| 93 | + </a> <?php | |
| 94 | + } | |
| 92 | 95 | } |
| 93 | 96 | } |
| 94 | 97 | } else { |
| 95 | 98 | esc_html_e('None','taskbuilder'); |