WordPress.org
Get WordPress

Plugin Directory

Changeset 3226189


Ignore:
Timestamp:
01/21/2025 12:51:57 PM (14 months ago)
Author:
taskbuilder
Message:

new update

Location:
taskbuilder
Files:
4 added
30 edited
1 copied

Legend:

Unmodified
Added
Removed

  • taskbuilder/tags/3.0.9/asset/css/admin.css

    r3174963 r3226189  
    15071507  font-size: 12px !important;
    15081508}
     1509
     1510#wppm_task_description, #wppm_proj_description{
     1511    height: 160px !important;
     1512    width: 100% !important;
     1513}

  • taskbuilder/tags/3.0.9/asset/js/admin.js

    r3191970 r3226189  
    458458function wppm_remove_task_user_filter(id){
    459459  jQuery('#wppm_task_user_display_container_'+id).remove();
    460 }
    461 
    462 function wppm_cancel_comment(){
    463   tinyMCE. activeEditor. setContent('');
    464   tinymce.remove('#wppm_task_comment');
    465   jQuery('#wppm_comment_btn').hide();
    466 }
    467 
    468 function wppm_cancel_proj_comment(){
    469   tinyMCE. activeEditor. setContent('');
    470   tinymce.remove('#wppm_proj_comment');
    471   jQuery('#wppm_proj_comment_btn').hide();
    472 }
    473 
    474 function wppm_submit_task_comment(id,proj_id){
    475   var dataform = new FormData(jQuery('#wppm_open_task')[0]);
    476   jQuery('#wppm_task_container').html(wppm_admin.loading_html);
    477   dataform.append('action','wppm_submit_task_comment');
    478   var comment_body = tinyMCE.get('wppm_task_comment').getContent().trim();
    479   dataform.append('comment_body',comment_body);
    480   dataform.append('task_id',id);
    481   jQuery.ajax({
    482     url: wppm_admin.ajax_url,
    483     type: 'POST',
    484     data: dataform,
    485     processData: false,
    486     contentType: false
    487   })
    488   .done(function (response_str) {
    489     if((proj_id!=0)||(proj_id!="")){
    490       wppm_open_project_tasks(id,proj_id);
    491     }else if((proj_id==0)||(proj_id=="")){
    492       wppm_open_task(id);
    493     }
    494   });
    495 }
    496 
    497 function wppm_submit_proj_comment(proj_id){
    498   var dataform = new FormData(jQuery('#wppm_open_project')[0]);
    499   jQuery('#wppm_load_individual_project_container').html(wppm_admin.loading_html);
    500   dataform.append('action','wppm_submit_proj_comment');
    501   var comment_body = tinyMCE.get('wppm_proj_comment').getContent().trim();
    502   dataform.append('comment_body',comment_body);
    503   dataform.append('proj_id',proj_id);
    504   jQuery.ajax({
    505     url: wppm_admin.ajax_url,
    506     type: 'POST',
    507     data: dataform,
    508     processData: false,
    509     contentType: false
    510   })
    511   .done(function (response_str) {
    512       wppm_open_project(proj_id);
    513   });
    514460}
    515461
    … …  
    13181264}
    13191265
     1266function wppm_get_rich_text_editor_settings(){
     1267  jQuery('.wppm_setting_pills li').removeClass('active');
     1268  jQuery('#wppm_settings_rich_text_editor').addClass('active');
     1269  jQuery('.wppm_setting_col2').html(wppm_admin.loading_html);
     1270  var data = {
     1271    action: 'wppm_get_rich_text_editor_settings'
     1272  };
     1273  jQuery.post(wppm_admin.ajax_url, data, function(response) {
     1274    jQuery('.wppm_setting_col2').html(response);
     1275  });
     1276}
     1277
     1278function wppm_set_rich_text_editor_settings(){
     1279  jQuery('.wppm_submit_wait').show();
     1280  var dataform = new FormData(jQuery('#wppm_frm_rich_text_editor_settings')[0]);
     1281  jQuery.ajax({
     1282    url: wppm_admin.ajax_url,
     1283    type: 'POST',
     1284    data: dataform,
     1285    processData: false,
     1286    contentType: false
     1287  })
     1288  .done(function (response_str) {
     1289    var response = JSON.parse(response_str);
     1290    jQuery('.wppm_submit_wait').hide();
     1291    if (response.sucess_status=='1') {
     1292      jQuery('#wppm_alert_success .wppm_alert_text').text(response.messege);
     1293    }
     1294    jQuery('#wppm_alert_success').slideDown('fast',function(){});
     1295    setTimeout(function(){ jQuery('#wppm_alert_success').slideUp('fast',function(){}); }, 3000);
     1296  });
     1297}
     1298
    13201299function wppm_get_ap_proj_list(current_tab_class) {
    13211300    jQuery( '.wppm-setting-tab-container button' ).removeClass( 'active' );

  • taskbuilder/tags/3.0.9/includes/admin/projects/open_project/wppm_view_project_tasks.php

    r3210469 r3226189  
    6666setcookie('wppm_grid_view_filters',wp_json_encode( $filters ),time() + 3600);
    6767
    68 if($filter_by=='completed'){
     68if($filter_by=='4'){
    6969    $wppm_tl_filter = "Task.status='4'";
    7070}elseif($filter_by=='overdue'){
    … …  
    7272}elseif($filter_by == 'unassigned'){
    7373    $wppm_tl_filter = "Task.users=''";
    74 }elseif($filter_by == 'todo'){
     74}elseif($filter_by == '1'){
    7575    $wppm_tl_filter = "Task.status='1'";
    76 }elseif($filter_by == 'inprogress'){
     76}elseif($filter_by == '2'){
    7777    $wppm_tl_filter = "Task.status='2'";
    78 }elseif($filter_by == 'hold'){
     78}elseif($filter_by == '3'){
    7979    $wppm_tl_filter = "Task.status='3'";
    8080}elseif($filter_by == 'mine'){
    … …  
    184184    }
    185185}
     186$todo_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(1)."'" );
     187$inp_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(2)."'" );
     188$hold_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(3)."'" );
     189$completed_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(4)."'" );
     190$todo_status_style = (!empty($todo_status_name))? "display:inline" :"display:none;";
     191$inp_status_style = (!empty($inp_status_name))? "display:inline" :"display:none;";
     192$hold_status_style = (!empty($hold_status_name))? "display:inline" :"display:none;";
     193$completed_status_style = (!empty($completed_status_name))? "display:inline" :"display:none;";
    186194?>
    187195<form name="wppm_view_project_task" id="wppm_view_project_task">
    … …  
    210218            <select id="wppm_task_filter" name="wppm_task_filter" onchange="wppm_apply_task_filter_grid_view()">
    211219            <option value="all"<?php echo ($filter_by == "all")? 'selected':""?>><?php echo esc_html_e('All','taskbuilder');?></option>
    212             <option value="todo" <?php echo ($filter_by == "todo")? 'selected':""?>><?php echo  esc_html_e('Todo','taskbuilder');?></option>
    213             <option value="inprogress" <?php echo ($filter_by == "inprogress")? 'selected':""?>><?php echo  esc_html_e('In Progress','taskbuilder');?></option>
    214             <option value="hold" <?php echo ($filter_by == "hold")? 'selected':""?>><?php echo  esc_html_e('Hold','taskbuilder');?></option>
    215             <option value="completed" <?php echo ($filter_by == "completed")? 'selected':""?>><?php echo  esc_html_e('Completed','taskbuilder');?></option>
     220            <option value="1" style="<?php echo $todo_status_style ?>" <?php echo ($filter_by == "1")? 'selected':""?>><?php echo  esc_html_e($todo_status_name,'taskbuilder');?></option>
     221            <option value="2" style="<?php echo $inp_status_style ?>" <?php echo ($filter_by == "2")? 'selected':""?>><?php echo  esc_html_e($inp_status_name,'taskbuilder');?></option>
     222            <option value="3" style="<?php echo $hold_status_style ?>" <?php echo ($filter_by == "3")? 'selected':""?>><?php echo  esc_html_e($hold_status_name,'taskbuilder');?></option>
     223            <option value="4" style="<?php echo $completed_status_style ?>" <?php echo ($filter_by == "4")? 'selected':""?>><?php echo  esc_html_e($completed_status_name,'taskbuilder');?></option>
    216224            <option value="mine" <?php echo ($filter_by == "mine")? 'selected':""?>><?php echo  esc_html_e('Mine','taskbuilder');?></option>
    217225            <option value="unassigned" <?php echo ($filter_by == "unassigned")? 'selected':""?>><?php echo  esc_html_e('Unassigned','taskbuilder');?></option>

  • taskbuilder/tags/3.0.9/includes/admin/projects/projects_list.php

    r3210469 r3226189  
    5959  $sort_by = 'proj_categories.name';
    6060}
    61 if($filter_by=='completed'){
     61if($filter_by=='4'){
    6262  $wppm_pl_filter = "status='4'";
    6363}elseif($filter_by=='overdue'){
    … …  
    6565}elseif($filter_by == 'unassigned'){
    6666  $wppm_pl_filter = "users=''";
    67 }elseif($filter_by == 'new'){
     67}elseif($filter_by == '1'){
    6868    $wppm_pl_filter = "status='1'";
    69 }elseif($filter_by == 'inprogress'){
     69}elseif($filter_by == '2'){
    7070    $wppm_pl_filter = "status='2'";
    71 }elseif($filter_by == 'hold'){
     71}elseif($filter_by == '3'){
    7272    $wppm_pl_filter = "status='3'";
    7373}elseif($filter_by == 'mine'){
    … …  
    124124$query = $query.$limit;
    125125$wppm_fillter = $wpdb->get_results($query);
     126$new_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_project_statuses where id='".esc_sql(1)."'" );
     127$inp_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_project_statuses where id='".esc_sql(2)."'" );
     128$hold_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_project_statuses where id='".esc_sql(3)."'" );
     129$completed_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_project_statuses where id='".esc_sql(4)."'" );
     130$new_style = (!empty($new_status_name))? "display:inline" :"display:none;";
     131$inp_status_style = (!empty($inp_status_name))? "display:inline" :"display:none;";
     132$hold_status_style = (!empty($hold_status_name))? "display:inline" :"display:none;";
     133$complete_status_style = (!empty($completed_status_name))? "display:inline" :"display:none;";
    126134?>
    127135<form id="wppm_project_list_frm">
    … …  
    148156            <select id="wppm_project_filter" name="wppm_project_filter" onchange="wppm_apply_project_filter()">
    149157              <option value="all"<?php echo ($filter_by == "all")? 'selected':""?>><?php echo esc_html_e('All','taskbuilder');?></option>
    150               <option value="new" <?php echo ($filter_by == "new")? 'selected':""?>><?php echo  esc_html_e('New','taskbuilder');?></option>
    151               <option value="inprogress" <?php echo ($filter_by == "inprogress")? 'selected':""?>><?php echo  esc_html_e('In Progress','taskbuilder');?></option>
    152               <option value="hold" <?php echo ($filter_by == "hold")? 'selected':""?>><?php echo  esc_html_e('Hold','taskbuilder');?></option>
    153               <option value="completed" <?php echo ($filter_by == "completed")? 'selected':""?>><?php echo  esc_html_e('Completed','taskbuilder');?></option>
     158              <option style="<?php echo $new_style ?>" value="1" <?php echo ($filter_by == "1")? 'selected':""?>><?php echo  esc_html_e($new_status_name,'taskbuilder');?></option>
     159              <option style="<?php echo $inp_status_style ?>" value="2" <?php echo ($filter_by == "2")? 'selected':""?>><?php echo  esc_html_e($inp_status_name,'taskbuilder');?></option>
     160              <option style="<?php echo $hold_status_style ?>" value="3" <?php echo ($filter_by == "3")? 'selected':""?>><?php echo  esc_html_e($hold_status_name,'taskbuilder');?></option>
     161              <option style="<?php echo $complete_status_style ?>" value="4" <?php echo ($filter_by == "4")? 'selected':""?>><?php echo  esc_html_e($completed_status_name,'taskbuilder');?></option>
    154162              <option value="mine" <?php echo ($filter_by == "mine")? 'selected':""?>><?php echo  esc_html_e('Mine','taskbuilder');?></option>
    155163              <option value="unassigned" <?php echo ($filter_by == "unassigned")? 'selected':""?>><?php echo  esc_html_e('Unassigned','taskbuilder');?></option>

  • taskbuilder/tags/3.0.9/includes/admin/projects/wppm_add_new_project.php

    r3210469 r3226189  
    1111$categories = $wpdb->get_results( "SELECT * FROM {$wpdb->prefix}wppm_project_categories ORDER BY $orderby_sql" );
    1212$wppm_current_user_capability = get_user_meta( $current_user->ID, 'wppm_capability', true );
     13$wppm_rich_text_editor = get_option('wppm_rich_text_editor');
     14$wppm_toolbar_actions = get_option('wppm_toolbar_actions');
    1315?>
    1416<form class='wppm_add_new_project wppm_bootstrap' onsubmit="return wppm_create_project();" id="wppm_add_new_project" method="post">
    … …  
    126128        enableTime: <?php echo ($wppm_project_time==1) ? 'true' : 'false' ?>,
    127129        dateFormat: "Y-m-d <?php echo ($wppm_project_time==1) ? 'H:i': '' ?>"
    128     });
    129     tinymce.remove();
    130     tinymce.init({
    131     selector:'#wppm_proj_description',
    132     body_id: 'wppm_proj_description',
    133     directionality : '<?php //echo 'rtl'; ?>',
    134     menubar: false,
    135     statusbar: false,
    136     height : '200',
    137     width  : '100%',
    138     plugins: [
    139         'lists link image directionality paste'
    140     ],
    141     image_advtab: true,
    142     toolbar: 'bold italic underline blockquote | alignleft aligncenter alignright | bullist numlist | rtl | link image',
    143     branding: false,
    144     autoresize_bottom_margin: 20,
    145     browser_spellcheck : true,
    146     relative_urls : false,
    147     paste_as_text: true,
    148     remove_script_host : false,
    149     convert_urls : true,
    150     setup: function (editor) {
    151     }
    152     });
     130    });<?php
     131    if((!empty($wppm_rich_text_editor)) && ($wppm_rich_text_editor == 1)){
     132        $bold = (isset($wppm_toolbar_actions['bold']) && $wppm_toolbar_actions['bold']==1)? 'bold' :"";
     133        $italic = (isset($wppm_toolbar_actions['italic']) && $wppm_toolbar_actions['italic']==1)? 'italic' :"";   
     134        $underline = (isset($wppm_toolbar_actions['underline']) && $wppm_toolbar_actions['underline']==1)?'underline' :"";   
     135        $blockquote = (isset($wppm_toolbar_actions['blockquote']) && $wppm_toolbar_actions['blockquote']==1)? 'blockquote' :"";   
     136        $align = (isset($wppm_toolbar_actions['align']) && $wppm_toolbar_actions['align']==1)?  ' alignleft aligncenter alignright ' :"";   
     137        $bullist = (isset($wppm_toolbar_actions['bullist']) && $wppm_toolbar_actions['bullist']==1)? $bullist = 'bullist' :"";
     138        $numlist = (isset($wppm_toolbar_actions['numlist']) && $wppm_toolbar_actions['numlist']==1)? $numlist = 'numlist' :"";     
     139        $rtl = (isset($wppm_toolbar_actions['rtl']) && $wppm_toolbar_actions['rtl']==1)? $rtl = 'rtl' :"";     
     140        $link = (isset($wppm_toolbar_actions['link']) && $wppm_toolbar_actions['link']==1)? $link = 'link' :"";
     141        $image = (isset($wppm_toolbar_actions['wppm_insert_editor_img']) && $wppm_toolbar_actions['wppm_insert_editor_img']==1)? $image = 'image' :"";     
     142        $forecolor = (isset($wppm_toolbar_actions['forecolor']) && $wppm_toolbar_actions['forecolor']==1)? $forecolor = 'forecolor' :"";
     143        $backcolor = (isset($wppm_toolbar_actions['backcolor']) && $wppm_toolbar_actions['backcolor']==1)? $backcolor = 'backcolor' :"";
     144        $strikethrough = (isset($wppm_toolbar_actions['strikethrough']) && $wppm_toolbar_actions['strikethrough']==1)? $strikethrough = 'strikethrough' :""; ?>
     145        tinymce.remove();
     146        tinymce.init({
     147        selector:'#wppm_proj_description',
     148        body_id: 'wppm_proj_description',
     149        directionality : '<?php //echo 'rtl'; ?>',
     150        menubar: false,
     151        statusbar: false,
     152        height : '200',
     153        width  : '100%',
     154        plugins: [
     155            'lists link image directionality paste textcolor'
     156        ],
     157        image_advtab: true,
     158        toolbar: '<?php echo $bold ?> <?php echo $italic ?> <?php echo $underline ?> <?php echo $blockquote?> | <?php echo $align ?> | <?php echo $bullist ?> <?php echo $numlist ?> | <?php echo $rtl ?> | <?php echo $link ?> <?php echo $image ?> | <?php echo $forecolor?> <?php echo $backcolor?> <?php echo $strikethrough ?>',
     159        branding: false,
     160        autoresize_bottom_margin: 20,
     161        browser_spellcheck : true,
     162        relative_urls : false,
     163        paste_as_text: true,
     164        remove_script_host : false,
     165        convert_urls : true,
     166        setup: function (editor) {
     167        }
     168        });
     169    <?php } ?>
    153170    jQuery("input[name='wppm_assigned_user']").keypress(function(e) {
    154171        //Enter key
    … …  
    214231  }
    215232  var dataform = new FormData(jQuery('#wppm_add_new_project')[0]);
     233  var is_tinymce = (typeof tinyMCE != "undefined") && tinyMCE.activeEditor && !tinyMCE.activeEditor.isHidden();
     234  var description = is_tinymce && tinymce.get('wppm_proj_description') ? tinyMCE.get('wppm_proj_description').getContent() : jQuery('#wppm_proj_description').val().trim();
     235  if (!description) return;
     236  dataform.append('wppm_proj_description', description);
    216237  jQuery('#wppm_project_container').html(wppm_admin.loading_html);
    217   var description = tinyMCE.get('wppm_proj_description').getContent().trim();
    218238  <?php echo do_action('wppm_create_project_dataform');?>
    219   dataform.append('wppm_proj_description', description);
    220239  jQuery.ajax({
    221240    url: wppm_admin.ajax_url,

  • taskbuilder/tags/3.0.9/includes/admin/projects/wppm_open_project.php

    r3210469 r3226189  
    1010$wppm_tinymce_visibility_open_project = get_option('wppm_tinymce_visibility_open_project');
    1111$settings = get_option("wppm-ap-modal");
     12$wppm_rich_text_editor = get_option('wppm_rich_text_editor');
     13$wppm_toolbar_actions = get_option('wppm_toolbar_actions');
    1214$wppm_current_user_capability = get_user_meta( $current_user->ID, 'wppm_capability', true );
    1315$current_date = date('Y-m-d');
    … …  
    395397          </div>
    396398        </div>
     399      </div>
     400      <div id="wppm_alert_success" class="alert alert-success wppm_alert" style="display:none;" role="alert">
     401        <img src="<?php echo esc_url( WPPM_PLUGIN_URL . 'asset/images/success.svg'); ?>" alt="success"><span class="wppm_alert_text"></span>
     402      </div>
     403      <div id="wppm_alert_error" class="alert alert-danger wppm_alert" style="display:none;" role="alert">
     404        <img src="<?php echo esc_url( WPPM_PLUGIN_URL . 'asset/images/warning-triangle.svg'); ?>" alt="warning-triangle"><span class="wppm_alert_text"></span>
    397405      </div>
    398406      <input type="hidden" id="wppm_proj_nonce" value="<?php echo wp_create_nonce('wppm_upload_proj_attach_file')?>">
    … …  
    443451        },
    444452      });
    445     <?php } ?>
    446     tinymce.remove();
    447     tinymce.init({
    448       selector:'#wppm_proj_description',
    449       body_id: 'wppm_proj_description',
    450       directionality : '<?php //echo 'rtl'; ?>',
    451       menubar: false,
    452       statusbar: false,
    453       height : '200',
    454       plugins: [
    455           'lists link image directionality'
    456       ],
    457       image_advtab: true,
    458       toolbar: 'bold italic underline blockquote | alignleft aligncenter alignright | bullist numlist | rtl | link image',
    459       branding: false,
    460       autoresize_bottom_margin: 20,
    461       browser_spellcheck : true,
    462       relative_urls : false,
    463       remove_script_host : false,
    464       convert_urls : true,
    465       setup: function (editor) {
    466       }
    467     }); <?php
    468     if($wppm_tinymce_visibility_open_project==1){?>
     453    <?php }
     454    if((!empty($wppm_rich_text_editor)) && ($wppm_rich_text_editor == 1)){
     455      $bold = (isset($wppm_toolbar_actions['bold']) && $wppm_toolbar_actions['bold']==1)? 'bold' :"";
     456      $italic = (isset($wppm_toolbar_actions['italic']) && $wppm_toolbar_actions['italic']==1)? 'italic' :"";   
     457      $underline = (isset($wppm_toolbar_actions['underline']) && $wppm_toolbar_actions['underline']==1)?'underline' :"";   
     458      $blockquote = (isset($wppm_toolbar_actions['blockquote']) && $wppm_toolbar_actions['blockquote']==1)? 'blockquote' :"";   
     459      $align = (isset($wppm_toolbar_actions['align']) && $wppm_toolbar_actions['align']==1)?  ' alignleft aligncenter alignright ' :"";   
     460      $bullist = (isset($wppm_toolbar_actions['bullist']) && $wppm_toolbar_actions['bullist']==1)? $bullist = 'bullist' :"";
     461      $numlist = (isset($wppm_toolbar_actions['numlist']) && $wppm_toolbar_actions['numlist']==1)? $numlist = 'numlist' :"";     
     462      $rtl = (isset($wppm_toolbar_actions['rtl']) && $wppm_toolbar_actions['rtl']==1)? $rtl = 'rtl' :"";     
     463      $link = (isset($wppm_toolbar_actions['link']) && $wppm_toolbar_actions['link']==1)? $link = 'link' :"";
     464      $image = (isset($wppm_toolbar_actions['wppm_insert_editor_img']) && $wppm_toolbar_actions['wppm_insert_editor_img']==1)? $image = 'image' :"";     
     465      $forecolor = (isset($wppm_toolbar_actions['forecolor']) && $wppm_toolbar_actions['forecolor']==1)? $forecolor = 'forecolor' :"";
     466      $backcolor = (isset($wppm_toolbar_actions['backcolor']) && $wppm_toolbar_actions['backcolor']==1)? $backcolor = 'backcolor' :"";
     467      $strikethrough = (isset($wppm_toolbar_actions['strikethrough']) && $wppm_toolbar_actions['strikethrough']==1)? $strikethrough = 'strikethrough' :""; ?>
    469468      tinymce.remove();
    470469      tinymce.init({
    471         selector:'#wppm_proj_comment',
    472         body_id: 'wppm_proj_comment',
     470        selector:'#wppm_proj_description',
     471        body_id: 'wppm_proj_description',
    473472        directionality : '<?php //echo 'rtl'; ?>',
    474473        menubar: false,
    475474        statusbar: false,
    476475        height : '200',
    477         width  : '100%',
    478476        plugins: [
    479             'lists link image directionality paste'
     477            'lists link image directionality textcolor'
    480478        ],
    481479        image_advtab: true,
    482         toolbar: 'bold italic underline blockquote | alignleft aligncenter alignright | bullist numlist | rtl | link image',
     480        toolbar: '<?php echo $bold ?> <?php echo $italic ?> <?php echo $underline ?> <?php echo $blockquote?> | <?php echo $align ?> | <?php echo $bullist ?> <?php echo $numlist ?> | <?php echo $rtl ?> | <?php echo $link ?> <?php echo $image ?> | <?php echo $forecolor?> <?php echo $backcolor?> <?php echo $strikethrough ?>',
    483481        branding: false,
    484482        autoresize_bottom_margin: 20,
    … …  
    487485        remove_script_host : false,
    488486        convert_urls : true,
    489         paste_as_text: true,
    490487        setup: function (editor) {
    491488        }
    492       });
     489      }); <?php
     490    }
     491    if($wppm_tinymce_visibility_open_project==1){
     492      if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){
     493        ?>
     494        tinymce.remove();
     495        tinymce.init({
     496          selector:'#wppm_proj_comment',
     497          body_id: 'wppm_proj_comment',
     498          directionality : '<?php //echo 'rtl'; ?>',
     499          menubar: false,
     500          statusbar: false,
     501          height : '200',
     502          width  : '100%',
     503          plugins: [
     504              'lists link image directionality paste textcolor'
     505          ],
     506          image_advtab: true,
     507          toolbar: '<?php echo $bold ?> <?php echo $italic ?> <?php echo $underline ?> <?php echo $blockquote?> | <?php echo $align ?> | <?php echo $bullist ?> <?php echo $numlist ?> | <?php echo $rtl ?> | <?php echo $link ?> <?php echo $image ?> | <?php echo $forecolor?> <?php echo $backcolor?> <?php echo $strikethrough ?>',
     508          branding: false,
     509          autoresize_bottom_margin: 20,
     510          browser_spellcheck : true,
     511          relative_urls : false,
     512          remove_script_host : false,
     513          convert_urls : true,
     514          paste_as_text: true,
     515          setup: function (editor) {
     516          }
     517        });
     518      <?php } ?>
    493519      jQuery('#wppm_proj_comment_btn').show();
    494520  <?php } ?>
    … …  
    496522
    497523function wppm_add_proj_comment(){
     524  <?php
     525  if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){
     526  ?>
    498527  tinymce.remove();
    499528  tinymce.init({
    … …  
    506535    width  : '100%',
    507536    plugins: [
    508         'lists link image directionality paste'
     537        'lists link image directionality paste textcolor'
    509538    ],
    510539    image_advtab: true,
    511     toolbar: 'bold italic underline blockquote | alignleft aligncenter alignright | bullist numlist | rtl | link image',
     540    toolbar: '<?php echo $bold ?> <?php echo $italic ?> <?php echo $underline ?> <?php echo $blockquote?> | <?php echo $align ?> | <?php echo $bullist ?> <?php echo $numlist ?> | <?php echo $rtl ?> | <?php echo $link ?> <?php echo $image ?> | <?php echo $forecolor?> <?php echo $backcolor?> <?php echo $strikethrough ?>',
    512541    branding: false,
    513542    autoresize_bottom_margin: 20,
    … …  
    520549    }
    521550  });
     551  <?php } else{ ?>
     552    jQuery('#wppm_proj_comment').css("width", "100%");
     553    jQuery('#wppm_proj_comment').css("height", "160px");
     554    jQuery('#wppm_proj_comment').css("color", "#000");
     555  <?php }?>
    522556  jQuery('#wppm_proj_comment_btn').show();
     557}
     558
     559function wppm_cancel_proj_comment(){ <?php
     560  if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){
     561  ?>
     562    tinyMCE. activeEditor. setContent('');
     563    tinymce.remove('#wppm_proj_comment');
     564    jQuery('#wppm_proj_comment_btn').hide();
     565  <?php } else{
     566    ?>
     567    jQuery('#wppm_proj_comment').css("width", "80%");
     568    jQuery('#wppm_proj_comment').css("height", "30px");
     569    jQuery('#wppm_proj_comment').css("color", "#000");
     570    jQuery('#wppm_proj_comment').css("padding", "5px");
     571    jQuery('#wppm_proj_comment').css(" margin-bottom", "15px");
     572    jQuery('#wppm_proj_comment').css("overflow", "hidden");
     573    jQuery('#wppm_proj_comment').css("border", "1 px solid #eee");
     574    jQuery('#wppm_proj_comment').css("color", "#eee");
     575    jQuery('#wppm_proj_comment').css("margin-top", "10px");
     576    jQuery('#wppm_proj_comment_btn').hide();
     577  <?php }?>
     578}
     579
     580function wppm_submit_proj_comment(proj_id){
     581  var dataform = new FormData(jQuery('#wppm_open_project')[0]);
     582  dataform.append('action','wppm_submit_proj_comment');
     583  <?php
     584  if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){ ?>
     585    var comment_body = tinyMCE.get('wppm_proj_comment').getContent().trim();
     586  <?php } else{ ?>
     587    var comment_body = jQuery("#wppm_proj_comment").val().trim();
     588  <?php }?>
     589  dataform.append('comment_body',comment_body);
     590  dataform.append('proj_id',proj_id);
     591  jQuery('#wppm_load_individual_project_container').html(wppm_admin.loading_html);
     592  jQuery.ajax({
     593    url: wppm_admin.ajax_url,
     594    type: 'POST',
     595    data: dataform,
     596    processData: false,
     597    contentType: false
     598  })
     599  .done(function (response_str) {
     600      wppm_open_project(proj_id);
     601  });
    523602}
    524603

  • taskbuilder/tags/3.0.9/includes/admin/settings.php

    r3191970 r3226189  
    2323        <li id="wppm_settings_appearance" role="presentation"><a href="javascript:wppm_get_appearance_settings();"><?php echo esc_html_e('Appearance','taskbuilder');?></a></li>
    2424        <li id="wppm_settings_coworker" role="presentation"><a href="javascript:wppm_get_coworker_permission_settings();"><?php echo esc_html_e('Co-workers Permission','taskbuilder');?></a></li>
     25        <li id="wppm_settings_rich_text_editor" role="presentation"><a href="javascript:wppm_get_rich_text_editor_settings();"><?php echo esc_html_e('Rich Text Editor','taskbuilder');?></a></li>
    2526        <?php do_action('wppm_after_setting_pills');?>
    2627      </ul>

  • taskbuilder/tags/3.0.9/includes/admin/tasks/open_task/wppm_open_task.php

    r3212866 r3226189  
    1212$wppm_tinymce_visibility_open_task = get_option('wppm_tinymce_visibility_open_task');
    1313$settings = get_option("wppm-ap-modal");
     14$wppm_rich_text_editor = get_option('wppm_rich_text_editor');
     15$wppm_toolbar_actions = get_option('wppm_toolbar_actions');
    1416if (!(($current_user->ID && $current_user->has_cap('manage_options')) || ($wppmfunction->has_permission('view_task',$id)))) {exit;}
    1517$proj_id = isset($_POST) && isset($_POST['proj_id']) ? intval(sanitize_text_field($_POST['proj_id'])) : 0;
    … …  
    618620          }
    619621    }
    620   if($wppm_tinymce_visibility_open_task==1){?>
     622    $bold = (isset($wppm_toolbar_actions['bold']) && $wppm_toolbar_actions['bold']==1)? 'bold' :"";
     623    $italic = (isset($wppm_toolbar_actions['italic']) && $wppm_toolbar_actions['italic']==1)? 'italic' :"";   
     624    $underline = (isset($wppm_toolbar_actions['underline']) && $wppm_toolbar_actions['underline']==1)?'underline' :"";   
     625    $blockquote = (isset($wppm_toolbar_actions['blockquote']) && $wppm_toolbar_actions['blockquote']==1)? 'blockquote' :"";   
     626    $align = (isset($wppm_toolbar_actions['align']) && $wppm_toolbar_actions['align']==1)?  ' alignleft aligncenter alignright ' :"";   
     627    $bullist = (isset($wppm_toolbar_actions['bullist']) && $wppm_toolbar_actions['bullist']==1)? $bullist = 'bullist' :"";
     628    $numlist = (isset($wppm_toolbar_actions['numlist']) && $wppm_toolbar_actions['numlist']==1)? $numlist = 'numlist' :"";     
     629    $rtl = (isset($wppm_toolbar_actions['rtl']) && $wppm_toolbar_actions['rtl']==1)? $rtl = 'rtl' :"";     
     630    $link = (isset($wppm_toolbar_actions['link']) && $wppm_toolbar_actions['link']==1)? $link = 'link' :"";
     631    $image = (isset($wppm_toolbar_actions['wppm_insert_editor_img']) && $wppm_toolbar_actions['wppm_insert_editor_img']==1)? $image = 'image' :"";     
     632    $forecolor = (isset($wppm_toolbar_actions['forecolor']) && $wppm_toolbar_actions['forecolor']==1)? $forecolor = 'forecolor' :"";
     633    $backcolor = (isset($wppm_toolbar_actions['backcolor']) && $wppm_toolbar_actions['backcolor']==1)? $backcolor = 'backcolor' :"";
     634    $strikethrough = (isset($wppm_toolbar_actions['strikethrough']) && $wppm_toolbar_actions['strikethrough']==1)? $strikethrough = 'strikethrough' :"";
     635    if(($wppm_tinymce_visibility_open_task==1)){
     636     if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){
     637      ?>
    621638      tinymce.remove();
    622639      tinymce.init({
    … …  
    629646        width  : '100%',
    630647        plugins: [
    631             'lists link image directionality paste'
     648            'lists link image directionality paste textcolor'
    632649        ],
    633650        image_advtab: true,
    634         toolbar: 'bold italic underline blockquote | alignleft aligncenter alignright | bullist numlist | rtl | link image',
     651        toolbar: '<?php echo $bold ?> <?php echo $italic ?> <?php echo $underline ?> <?php echo $blockquote?> | <?php echo $align ?> | <?php echo $bullist ?> <?php echo $numlist ?> | <?php echo $rtl ?> | <?php echo $link ?> <?php echo $image ?> | <?php echo $forecolor?> <?php echo $backcolor?> <?php echo $strikethrough ?>',
    635652        branding: false,
    636653        autoresize_bottom_margin: 20,
    … …  
    644661      });
    645662      jQuery('#wppm_comment_btn').show();
    646   <?php } ?>
     663      <?php } ?>
     664    <?php } ?>
    647665});
    648666
     667function wppm_cancel_comment(){ <?php
     668  if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){
     669  ?>
     670    tinyMCE. activeEditor. setContent('');
     671    tinymce.remove('#wppm_task_comment');
     672    jQuery('#wppm_comment_btn').hide();
     673  <?php } else{
     674    ?>
     675    jQuery('#wppm_task_comment').css("width", "80%");
     676    jQuery('#wppm_task_comment').css("height", "30px");
     677    jQuery('#wppm_task_comment').css("color", "#000");
     678    jQuery('#wppm_task_comment').css("padding", "5px");
     679    jQuery('#wppm_task_comment').css(" margin-bottom", "15px");
     680    jQuery('#wppm_task_comment').css("overflow", "hidden");
     681    jQuery('#wppm_task_comment').css("border", "1 px solid #eee");
     682    jQuery('#wppm_task_comment').css("color", "#eee");
     683    jQuery('#wppm_task_comment').css("margin-top", "10px");
     684    jQuery('#wppm_comment_btn').hide();
     685  <?php }?>
     686}
     687
    649688function wppm_add_task_comment(){
     689  <?php
     690  if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){
     691  ?>
    650692  tinymce.remove();
    651693  tinymce.init({
    … …  
    658700    width  : '100%',
    659701    plugins: [
    660         'lists link image directionality paste'
     702        'lists link image directionality paste textcolor'
    661703    ],
    662704    image_advtab: true,
    663     toolbar: 'bold italic underline blockquote | alignleft aligncenter alignright | bullist numlist | rtl | link image',
     705    toolbar: '<?php echo $bold ?> <?php echo $italic ?> <?php echo $underline ?> <?php echo $blockquote?> | <?php echo $align ?> | <?php echo $bullist ?> <?php echo $numlist ?> | <?php echo $rtl ?> | <?php echo $link ?> <?php echo $image ?> | <?php echo $forecolor?> <?php echo $backcolor?> <?php echo $strikethrough ?>',
    664706    branding: false,
    665707    autoresize_bottom_margin: 20,
    … …  
    672714    }
    673715  });
     716  <?php } else{ ?>
     717    jQuery('#wppm_task_comment').css("width", "100%");
     718    jQuery('#wppm_task_comment').css("height", "160px");
     719    jQuery('#wppm_task_comment').css("color", "#000");
     720  <?php }?>
    674721  jQuery('#wppm_comment_btn').show();
     722}
     723
     724function wppm_submit_task_comment(id,proj_id){
     725  var dataform = new FormData(jQuery('#wppm_open_task')[0]);
     726  dataform.append('action','wppm_submit_task_comment');
     727  <?php
     728  if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){ ?>
     729    var comment_body = tinyMCE.get('wppm_task_comment').getContent().trim();
     730  <?php } else{ ?>
     731    var comment_body = jQuery("#wppm_task_comment").val();
     732  <?php }?>
     733  dataform.append('comment_body',comment_body);
     734  dataform.append('task_id',id);
     735  jQuery('#wppm_task_container').html(wppm_admin.loading_html);
     736  jQuery.ajax({
     737    url: wppm_admin.ajax_url,
     738    type: 'POST',
     739    data: dataform,
     740    processData: false,
     741    contentType: false
     742  })
     743  .done(function (response_str) {
     744    if((proj_id!=0)||(proj_id!="")){
     745      wppm_open_project_tasks(id,proj_id);
     746    }else if((proj_id==0)||(proj_id=="")){
     747      wppm_open_task(id);
     748    }
     749  });
    675750}
    676751

  • taskbuilder/tags/3.0.9/includes/admin/tasks/wppm_add_new_task.php

    r3210469 r3226189  
    77$orderby_prio_sql = esc_sql(sanitize_sql_orderby( "name" ));
    88$cu_id = esc_sql($current_user->ID);
     9$wppm_rich_text_editor = get_option('wppm_rich_text_editor');
     10$wppm_toolbar_actions = get_option('wppm_toolbar_actions');
    911$priorities = $wpdb->get_results( "SELECT * FROM {$wpdb->prefix}wppm_task_priorities ORDER BY '$orderby_prio_sql'" );
    1012$wppm_current_user_capability = get_user_meta( $current_user->ID, 'wppm_capability', true );
    … …  
    208210        dateFormat: "Y-m-d H:i"
    209211        //minDate: startdate
    210     });
    211     tinymce.remove();
    212     tinymce.init({
    213     selector:'#wppm_task_description',
    214     body_id: 'wppm_task_description',
    215     directionality : '<?php //echo 'rtl'; ?>',
    216     menubar: false,
    217     statusbar: false,
    218     height : '200',
    219     width  : '100%',
    220     plugins: [
    221         'lists link image directionality paste'
    222     ],
    223     image_advtab: true,
    224     toolbar: 'bold italic underline blockquote | alignleft aligncenter alignright | bullist numlist | rtl | link image',
    225     branding: false,
    226     autoresize_bottom_margin: 20,
    227     browser_spellcheck : true,
    228     relative_urls : false,
    229     remove_script_host : false,
    230     paste_as_text: true,
    231     convert_urls : true,
    232     setup: function (editor) {
    233     }
    234     });
     212    });<?php
     213    if((!empty($wppm_rich_text_editor)) && ($wppm_rich_text_editor == 1)){
     214        $bold = (isset($wppm_toolbar_actions['bold']) && $wppm_toolbar_actions['bold']==1)? 'bold' :"";
     215        $italic = (isset($wppm_toolbar_actions['italic']) && $wppm_toolbar_actions['italic']==1)? 'italic' :"";   
     216        $underline = (isset($wppm_toolbar_actions['underline']) && $wppm_toolbar_actions['underline']==1)?'underline' :"";   
     217        $blockquote = (isset($wppm_toolbar_actions['blockquote']) && $wppm_toolbar_actions['blockquote']==1)? 'blockquote' :"";   
     218        $align = (isset($wppm_toolbar_actions['align']) && $wppm_toolbar_actions['align']==1)?  ' alignleft aligncenter alignright ' :"";   
     219        $bullist = (isset($wppm_toolbar_actions['bullist']) && $wppm_toolbar_actions['bullist']==1)? $bullist = 'bullist' :"";
     220        $numlist = (isset($wppm_toolbar_actions['numlist']) && $wppm_toolbar_actions['numlist']==1)? $numlist = 'numlist' :"";     
     221        $rtl = (isset($wppm_toolbar_actions['rtl']) && $wppm_toolbar_actions['rtl']==1)? $rtl = 'rtl' :"";     
     222        $link = (isset($wppm_toolbar_actions['link']) && $wppm_toolbar_actions['link']==1)? $link = 'link' :"";
     223        $image = (isset($wppm_toolbar_actions['wppm_insert_editor_img']) && $wppm_toolbar_actions['wppm_insert_editor_img']==1)? $image = 'image' :"";     
     224        $forecolor = (isset($wppm_toolbar_actions['forecolor']) && $wppm_toolbar_actions['forecolor']==1)? $forecolor = 'forecolor' :"";
     225        $backcolor = (isset($wppm_toolbar_actions['backcolor']) && $wppm_toolbar_actions['backcolor']==1)? $backcolor = 'backcolor' :"";
     226        $strikethrough = (isset($wppm_toolbar_actions['strikethrough']) && $wppm_toolbar_actions['strikethrough']==1)? $strikethrough = 'strikethrough' :""; ?>
     227        tinymce.remove();
     228        tinymce.init({
     229        selector:'#wppm_task_description',
     230        body_id: 'wppm_task_description',
     231        directionality : '<?php //echo 'rtl'; ?>',
     232        menubar: false,
     233        statusbar: false,
     234        height : '200',
     235        width  : '100%',
     236        plugins: [
     237            'lists link image directionality paste textcolor'
     238        ],
     239        image_advtab: true,
     240        toolbar: '<?php echo $bold ?> <?php echo $italic ?> <?php echo $underline ?> <?php echo $blockquote?> | <?php echo $align ?> | <?php echo $bullist ?> <?php echo $numlist ?> | <?php echo $rtl ?> | <?php echo $link ?> <?php echo $image ?> | <?php echo $forecolor?> <?php echo $backcolor?> <?php echo $strikethrough ?>',
     241        branding: false,
     242        autoresize_bottom_margin: 20,
     243        browser_spellcheck : true,
     244        relative_urls : false,
     245        remove_script_host : false,
     246        paste_as_text: true,
     247        convert_urls : true,
     248        setup: function (editor) {
     249        }
     250        });
     251    <?php } ?>
    235252    jQuery("input[name='wppm_assign_task_users']").keypress(function(e) {
    236253        //Enter key
    … …  
    295312    <?php do_action('wppm_create_ticket_js_function'); ?>
    296313    var dataform = new FormData(jQuery('#wppm_add_new_task')[0]);
     314    var is_tinymce = (typeof tinyMCE != "undefined") && tinyMCE.activeEditor && !tinyMCE.activeEditor.isHidden();
     315    var description = is_tinymce && tinymce.get('wppm_task_description') ? tinyMCE.get('wppm_task_description').getContent() : jQuery('#wppm_task_description').val().trim();
     316    if (!description) return;
     317    dataform.append('wppm_task_description', description);
    297318    jQuery('#wppm_task_container').html(wppm_admin.loading_html);
    298     var description = tinyMCE.get('wppm_task_description').getContent().trim();
    299     dataform.append('wppm_task_description', description);
    300319    <?php do_action('wppm_create_task_dataform'); ?>
    301320    jQuery.ajax({

  • taskbuilder/tags/3.0.9/includes/admin/tasks/wppm_tasks_list.php

    r3210469 r3226189  
    8989  $sort_by='task_priorities.name';
    9090}
    91 if($filter_by=='completed'){
     91if($filter_by=='4'){
    9292  $wppm_tl_filter = "Task.status='4'";
    9393}elseif($filter_by=='overdue'){
    … …  
    9595}elseif($filter_by == 'unassigned'){
    9696  $wppm_tl_filter = "Task.users=''";
    97 }elseif($filter_by == 'todo'){
     97}elseif($filter_by == '1'){
    9898  $wppm_tl_filter = "Task.status='1'";
    99 }elseif($filter_by == 'inprogress'){
     99}elseif($filter_by == '2'){
    100100  $wppm_tl_filter = "Task.status='2'";
    101 }elseif($filter_by == 'hold'){
     101}elseif($filter_by == '3'){
    102102  $wppm_tl_filter = "Task.status='3'";
    103103}elseif($filter_by == 'mine'){
    … …  
    208208  $cs_style = "display:none;";
    209209}
     210$todo_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(1)."'" );
     211$inp_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(2)."'" );
     212$hold_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(3)."'" );
     213$completed_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(4)."'" );
     214$todo_status_style = (!empty($todo_status_name))? "display:inline" :"display:none;";
     215$inp_status_style = (!empty($inp_status_name))? "display:inline" :"display:none;";
     216$hold_status_style = (!empty($hold_status_name))? "display:inline" :"display:none;";
     217$completed_status_style = (!empty($completed_status_name))? "display:inline" :"display:none;";
    210218?>
    211219<form id="wppm_task_list_frm">
    … …  
    226234        <select id="wppm_task_filter" name="wppm_task_filter" onchange="wppm_apply_task_filter()">
    227235          <option value="all"<?php echo ($filter_by == "all")? 'selected':""?>><?php echo esc_html_e('All','taskbuilder');?></option>
    228           <option value="todo" <?php echo ($filter_by == "todo")? 'selected':""?>><?php echo  esc_html_e('Todo','taskbuilder');?></option>
    229           <option value="inprogress" <?php echo ($filter_by == "inprogress")? 'selected':""?>><?php echo  esc_html_e('In Progress','taskbuilder');?></option>
    230           <option value="hold" <?php echo ($filter_by == "hold")? 'selected':""?>><?php echo  esc_html_e('Hold','taskbuilder');?></option>
    231           <option value="completed" <?php echo ($filter_by == "completed")? 'selected':""?>><?php echo  esc_html_e('Completed','taskbuilder');?></option>
     236          <option value="1" style="<?php echo $todo_status_style ?>" <?php echo ($filter_by == "1")? 'selected':""?>><?php echo  esc_html_e($todo_status_name,'taskbuilder');?></option>
     237          <option value="2" style="<?php echo $inp_status_style ?>" <?php echo ($filter_by == "2")? 'selected':""?>><?php echo  esc_html_e($inp_status_name,'taskbuilder');?></option>
     238          <option value="3" style="<?php echo $hold_status_style ?>" <?php echo ($filter_by == "3")? 'selected':""?>><?php echo  esc_html_e($hold_status_name,'taskbuilder');?></option>
     239          <option value="4" style="<?php echo $completed_status_style ?>" <?php echo ($filter_by == "4")? 'selected':""?>><?php echo  esc_html_e($completed_status_name,'taskbuilder');?></option>
    232240          <option value="mine" <?php echo ($filter_by == "mine")? 'selected':""?>><?php echo  esc_html_e('Mine','taskbuilder');?></option>
    233241          <option value="unassigned" <?php echo ($filter_by == "unassigned")? 'selected':""?>><?php echo  esc_html_e('Unassigned','taskbuilder');?></option>

  • taskbuilder/tags/3.0.9/includes/class-wppm-admin.php

    r3191970 r3226189  
    158158      add_action('wp_ajax_wppm_get_coworker_permission_settings',array($this,'wppm_get_coworker_permission_settings'));
    159159      add_action('wp_ajax_wppm_set_coworkers_permission_settings',array($this,'wppm_set_coworkers_permission_settings'));
     160      add_action('wp_ajax_wppm_get_rich_text_editor_settings',array($this,'wppm_get_rich_text_editor_settings'));
     161      add_action('wp_ajax_wppm_set_rich_text_editor_settings',array($this,'wppm_set_rich_text_editor_settings'));
    160162    }
    161163   
    … …  
    10571059    }
    10581060   
     1061    public function wppm_get_rich_text_editor_settings(){
     1062      include WPPM_ABSPATH.'includes/admin/settings/wppm_get_rich_text_editor_settings.php';
     1063      die();
     1064    }
     1065
     1066    public function wppm_set_rich_text_editor_settings(){
     1067      include WPPM_ABSPATH.'includes/admin/settings/wppm_set_rich_text_editor_settings.php';
     1068      die();
     1069    }
     1070   
    10591071  }
    10601072 

  • taskbuilder/tags/3.0.9/includes/class-wppm-functions.php

    r3210469 r3226189  
    999999            return $user_role;
    10001000        }
     1001
     1002        public static function wppm_toolbar_options_setting() {
     1003            $toolbar = array(
     1004                array(
     1005                    'name'  => esc_attr__( 'Bold', 'taskbuilder' ),
     1006                    'value' => 'bold',
     1007                ),
     1008                array(
     1009                    'name'  => esc_attr__( 'Italic', 'taskbuilder' ),
     1010                    'value' => 'italic',
     1011                ),
     1012                array(
     1013                    'name'  => esc_attr__( 'Underline', 'taskbuilder' ),
     1014                    'value' => 'underline',
     1015                ),
     1016                array(
     1017                    'name'  => esc_attr__( 'Blockquote', 'taskbuilder' ),
     1018                    'value' => 'blockquote',
     1019                ),
     1020                array(
     1021                    'name'  => esc_attr__( 'Align', 'taskbuilder' ),
     1022                    'value' => 'align',
     1023                ),
     1024                array(
     1025                    'name'  => esc_attr__( 'Bulleted list', 'taskbuilder' ),
     1026                    'value' => 'bullist',
     1027                ),
     1028                array(
     1029                    'name'  => esc_attr__( 'Numbered list', 'taskbuilder' ),
     1030                    'value' => 'numlist',
     1031                ),
     1032                array(
     1033                    'name'  => esc_attr__( 'Right to left', 'taskbuilder' ),
     1034                    'value' => 'rtl',
     1035                ),
     1036                array(
     1037                    'name'  => esc_attr__( 'Link', 'taskbuilder' ),
     1038                    'value' => 'link',
     1039                ),
     1040                array(
     1041                    'name'  => esc_attr__( 'Image', 'taskbuilder' ),
     1042                    'value' => 'wppm_insert_editor_img',
     1043                ),
     1044                array(
     1045                    'name'  => esc_attr__( 'Text Color', 'taskbuilder' ),
     1046                    'value' => 'forecolor',
     1047                ),
     1048                array(
     1049                    'name'  => esc_attr__( 'Text Background Color', 'taskbuilder' ),
     1050                    'value' => 'backcolor',
     1051                ),
     1052                array(
     1053                    'name'  => esc_attr__( 'Strikethrough', 'taskbuilder' ),
     1054                    'value' => 'strikethrough',
     1055                ),
     1056            );
     1057            return $toolbar;
     1058        }
    10011059    }
    1002 
    1003 
    10041060endif;
    10051061$GLOBALS['wppmfunction'] =  new WPPM_Functions();

  • taskbuilder/tags/3.0.9/includes/wppm-install.php

    r3191970 r3226189  
    426426            update_option('wppm_allow_coworkers_change_status', 1);
    427427        }
     428        if($installed_version < '3.0.9'){
     429            update_option('wppm_rich_text_editor',1);
     430            update_option(
     431                'wppm_toolbar_actions',
     432                array(
     433                    'bold'     => '1',
     434                    'italic'    => '1',
     435                    'underline' =>'1',
     436                    'blockquote' =>'1',
     437                    'align'=>'1',
     438                    'bullist'=>'1',
     439                    'numlist'=>'1',
     440                    'rtl'=>'1',
     441                    'link'=>'1',
     442                    'wppm_insert_editor_img'=>'1',
     443                    'forecolor'=>'0',
     444                    'backcolor' => '0',
     445                    'strikethrough' => '0'
     446                )
     447            );
     448        }
    428449        // update wppm_version option to plugin version
    429450        update_option( 'wppm_version', WPPM_VERSION );

  • taskbuilder/tags/3.0.9/readme.txt

    r3212866 r3226189  
    55Requires at least: 4.4
    66Tested up to: 6.7.1
    7 Stable tag: 3.0.8
     7Stable tag: 3.0.9
    88License: GPL v3
    99
    … …  
    112112
    113113== Changelog ==
     114= V 3.0.9(Jan 21,2025) =
     115* Fix: If status name change from setting, changes not reflect on filter of task list, project list.
     116* New: Rich Text Editor Setting. You can enable/disable Rich Text Editor from setting( Dashboard > projects > Settings > Rich Text Editor).
     117* New(Pro feature): You can rearrange custom fields. By that order, custom fields will display in create task form.
     118
    114119= V 3.0.8(Dec 25,2024) =
    115120* Fix: Attachments not opening in task comment.

  • taskbuilder/tags/3.0.9/taskbuilder.php

    r3212866 r3226189  
    44 * Plugin URI: https://wordpress.org/plugins/taskbuilder/
    55 * Description: Wordpress Project & Task Management plugin. Easy to keep track of projects & tasks!
    6  * Version: 3.0.8
     6 * Version: 3.0.9
    77 * Author: Taskbuilder Team
    88 * Author URI: https://taskbuilder.net/
    … …  
    2020 
    2121  final class WP_Taskbuilder {
    22     public $version    = '3.0.8';
     22    public $version    = '3.0.9';
    2323    public function __construct() {
    2424      // define global constants

  • taskbuilder/trunk/asset/css/admin.css

    r3174963 r3226189  
    15071507  font-size: 12px !important;
    15081508}
     1509
     1510#wppm_task_description, #wppm_proj_description{
     1511    height: 160px !important;
     1512    width: 100% !important;
     1513}

  • taskbuilder/trunk/asset/js/admin.js

    r3191970 r3226189  
    458458function wppm_remove_task_user_filter(id){
    459459  jQuery('#wppm_task_user_display_container_'+id).remove();
    460 }
    461 
    462 function wppm_cancel_comment(){
    463   tinyMCE. activeEditor. setContent('');
    464   tinymce.remove('#wppm_task_comment');
    465   jQuery('#wppm_comment_btn').hide();
    466 }
    467 
    468 function wppm_cancel_proj_comment(){
    469   tinyMCE. activeEditor. setContent('');
    470   tinymce.remove('#wppm_proj_comment');
    471   jQuery('#wppm_proj_comment_btn').hide();
    472 }
    473 
    474 function wppm_submit_task_comment(id,proj_id){
    475   var dataform = new FormData(jQuery('#wppm_open_task')[0]);
    476   jQuery('#wppm_task_container').html(wppm_admin.loading_html);
    477   dataform.append('action','wppm_submit_task_comment');
    478   var comment_body = tinyMCE.get('wppm_task_comment').getContent().trim();
    479   dataform.append('comment_body',comment_body);
    480   dataform.append('task_id',id);
    481   jQuery.ajax({
    482     url: wppm_admin.ajax_url,
    483     type: 'POST',
    484     data: dataform,
    485     processData: false,
    486     contentType: false
    487   })
    488   .done(function (response_str) {
    489     if((proj_id!=0)||(proj_id!="")){
    490       wppm_open_project_tasks(id,proj_id);
    491     }else if((proj_id==0)||(proj_id=="")){
    492       wppm_open_task(id);
    493     }
    494   });
    495 }
    496 
    497 function wppm_submit_proj_comment(proj_id){
    498   var dataform = new FormData(jQuery('#wppm_open_project')[0]);
    499   jQuery('#wppm_load_individual_project_container').html(wppm_admin.loading_html);
    500   dataform.append('action','wppm_submit_proj_comment');
    501   var comment_body = tinyMCE.get('wppm_proj_comment').getContent().trim();
    502   dataform.append('comment_body',comment_body);
    503   dataform.append('proj_id',proj_id);
    504   jQuery.ajax({
    505     url: wppm_admin.ajax_url,
    506     type: 'POST',
    507     data: dataform,
    508     processData: false,
    509     contentType: false
    510   })
    511   .done(function (response_str) {
    512       wppm_open_project(proj_id);
    513   });
    514460}
    515461
    … …  
    13181264}
    13191265
     1266function wppm_get_rich_text_editor_settings(){
     1267  jQuery('.wppm_setting_pills li').removeClass('active');
     1268  jQuery('#wppm_settings_rich_text_editor').addClass('active');
     1269  jQuery('.wppm_setting_col2').html(wppm_admin.loading_html);
     1270  var data = {
     1271    action: 'wppm_get_rich_text_editor_settings'
     1272  };
     1273  jQuery.post(wppm_admin.ajax_url, data, function(response) {
     1274    jQuery('.wppm_setting_col2').html(response);
     1275  });
     1276}
     1277
     1278function wppm_set_rich_text_editor_settings(){
     1279  jQuery('.wppm_submit_wait').show();
     1280  var dataform = new FormData(jQuery('#wppm_frm_rich_text_editor_settings')[0]);
     1281  jQuery.ajax({
     1282    url: wppm_admin.ajax_url,
     1283    type: 'POST',
     1284    data: dataform,
     1285    processData: false,
     1286    contentType: false
     1287  })
     1288  .done(function (response_str) {
     1289    var response = JSON.parse(response_str);
     1290    jQuery('.wppm_submit_wait').hide();
     1291    if (response.sucess_status=='1') {
     1292      jQuery('#wppm_alert_success .wppm_alert_text').text(response.messege);
     1293    }
     1294    jQuery('#wppm_alert_success').slideDown('fast',function(){});
     1295    setTimeout(function(){ jQuery('#wppm_alert_success').slideUp('fast',function(){}); }, 3000);
     1296  });
     1297}
     1298
    13201299function wppm_get_ap_proj_list(current_tab_class) {
    13211300    jQuery( '.wppm-setting-tab-container button' ).removeClass( 'active' );

  • taskbuilder/trunk/includes/admin/projects/open_project/wppm_view_project_tasks.php

    r3210469 r3226189  
    6666setcookie('wppm_grid_view_filters',wp_json_encode( $filters ),time() + 3600);
    6767
    68 if($filter_by=='completed'){
     68if($filter_by=='4'){
    6969    $wppm_tl_filter = "Task.status='4'";
    7070}elseif($filter_by=='overdue'){
    … …  
    7272}elseif($filter_by == 'unassigned'){
    7373    $wppm_tl_filter = "Task.users=''";
    74 }elseif($filter_by == 'todo'){
     74}elseif($filter_by == '1'){
    7575    $wppm_tl_filter = "Task.status='1'";
    76 }elseif($filter_by == 'inprogress'){
     76}elseif($filter_by == '2'){
    7777    $wppm_tl_filter = "Task.status='2'";
    78 }elseif($filter_by == 'hold'){
     78}elseif($filter_by == '3'){
    7979    $wppm_tl_filter = "Task.status='3'";
    8080}elseif($filter_by == 'mine'){
    … …  
    184184    }
    185185}
     186$todo_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(1)."'" );
     187$inp_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(2)."'" );
     188$hold_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(3)."'" );
     189$completed_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(4)."'" );
     190$todo_status_style = (!empty($todo_status_name))? "display:inline" :"display:none;";
     191$inp_status_style = (!empty($inp_status_name))? "display:inline" :"display:none;";
     192$hold_status_style = (!empty($hold_status_name))? "display:inline" :"display:none;";
     193$completed_status_style = (!empty($completed_status_name))? "display:inline" :"display:none;";
    186194?>
    187195<form name="wppm_view_project_task" id="wppm_view_project_task">
    … …  
    210218            <select id="wppm_task_filter" name="wppm_task_filter" onchange="wppm_apply_task_filter_grid_view()">
    211219            <option value="all"<?php echo ($filter_by == "all")? 'selected':""?>><?php echo esc_html_e('All','taskbuilder');?></option>
    212             <option value="todo" <?php echo ($filter_by == "todo")? 'selected':""?>><?php echo  esc_html_e('Todo','taskbuilder');?></option>
    213             <option value="inprogress" <?php echo ($filter_by == "inprogress")? 'selected':""?>><?php echo  esc_html_e('In Progress','taskbuilder');?></option>
    214             <option value="hold" <?php echo ($filter_by == "hold")? 'selected':""?>><?php echo  esc_html_e('Hold','taskbuilder');?></option>
    215             <option value="completed" <?php echo ($filter_by == "completed")? 'selected':""?>><?php echo  esc_html_e('Completed','taskbuilder');?></option>
     220            <option value="1" style="<?php echo $todo_status_style ?>" <?php echo ($filter_by == "1")? 'selected':""?>><?php echo  esc_html_e($todo_status_name,'taskbuilder');?></option>
     221            <option value="2" style="<?php echo $inp_status_style ?>" <?php echo ($filter_by == "2")? 'selected':""?>><?php echo  esc_html_e($inp_status_name,'taskbuilder');?></option>
     222            <option value="3" style="<?php echo $hold_status_style ?>" <?php echo ($filter_by == "3")? 'selected':""?>><?php echo  esc_html_e($hold_status_name,'taskbuilder');?></option>
     223            <option value="4" style="<?php echo $completed_status_style ?>" <?php echo ($filter_by == "4")? 'selected':""?>><?php echo  esc_html_e($completed_status_name,'taskbuilder');?></option>
    216224            <option value="mine" <?php echo ($filter_by == "mine")? 'selected':""?>><?php echo  esc_html_e('Mine','taskbuilder');?></option>
    217225            <option value="unassigned" <?php echo ($filter_by == "unassigned")? 'selected':""?>><?php echo  esc_html_e('Unassigned','taskbuilder');?></option>

  • taskbuilder/trunk/includes/admin/projects/projects_list.php

    r3210469 r3226189  
    5959  $sort_by = 'proj_categories.name';
    6060}
    61 if($filter_by=='completed'){
     61if($filter_by=='4'){
    6262  $wppm_pl_filter = "status='4'";
    6363}elseif($filter_by=='overdue'){
    … …  
    6565}elseif($filter_by == 'unassigned'){
    6666  $wppm_pl_filter = "users=''";
    67 }elseif($filter_by == 'new'){
     67}elseif($filter_by == '1'){
    6868    $wppm_pl_filter = "status='1'";
    69 }elseif($filter_by == 'inprogress'){
     69}elseif($filter_by == '2'){
    7070    $wppm_pl_filter = "status='2'";
    71 }elseif($filter_by == 'hold'){
     71}elseif($filter_by == '3'){
    7272    $wppm_pl_filter = "status='3'";
    7373}elseif($filter_by == 'mine'){
    … …  
    124124$query = $query.$limit;
    125125$wppm_fillter = $wpdb->get_results($query);
     126$new_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_project_statuses where id='".esc_sql(1)."'" );
     127$inp_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_project_statuses where id='".esc_sql(2)."'" );
     128$hold_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_project_statuses where id='".esc_sql(3)."'" );
     129$completed_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_project_statuses where id='".esc_sql(4)."'" );
     130$new_style = (!empty($new_status_name))? "display:inline" :"display:none;";
     131$inp_status_style = (!empty($inp_status_name))? "display:inline" :"display:none;";
     132$hold_status_style = (!empty($hold_status_name))? "display:inline" :"display:none;";
     133$complete_status_style = (!empty($completed_status_name))? "display:inline" :"display:none;";
    126134?>
    127135<form id="wppm_project_list_frm">
    … …  
    148156            <select id="wppm_project_filter" name="wppm_project_filter" onchange="wppm_apply_project_filter()">
    149157              <option value="all"<?php echo ($filter_by == "all")? 'selected':""?>><?php echo esc_html_e('All','taskbuilder');?></option>
    150               <option value="new" <?php echo ($filter_by == "new")? 'selected':""?>><?php echo  esc_html_e('New','taskbuilder');?></option>
    151               <option value="inprogress" <?php echo ($filter_by == "inprogress")? 'selected':""?>><?php echo  esc_html_e('In Progress','taskbuilder');?></option>
    152               <option value="hold" <?php echo ($filter_by == "hold")? 'selected':""?>><?php echo  esc_html_e('Hold','taskbuilder');?></option>
    153               <option value="completed" <?php echo ($filter_by == "completed")? 'selected':""?>><?php echo  esc_html_e('Completed','taskbuilder');?></option>
     158              <option style="<?php echo $new_style ?>" value="1" <?php echo ($filter_by == "1")? 'selected':""?>><?php echo  esc_html_e($new_status_name,'taskbuilder');?></option>
     159              <option style="<?php echo $inp_status_style ?>" value="2" <?php echo ($filter_by == "2")? 'selected':""?>><?php echo  esc_html_e($inp_status_name,'taskbuilder');?></option>
     160              <option style="<?php echo $hold_status_style ?>" value="3" <?php echo ($filter_by == "3")? 'selected':""?>><?php echo  esc_html_e($hold_status_name,'taskbuilder');?></option>
     161              <option style="<?php echo $complete_status_style ?>" value="4" <?php echo ($filter_by == "4")? 'selected':""?>><?php echo  esc_html_e($completed_status_name,'taskbuilder');?></option>
    154162              <option value="mine" <?php echo ($filter_by == "mine")? 'selected':""?>><?php echo  esc_html_e('Mine','taskbuilder');?></option>
    155163              <option value="unassigned" <?php echo ($filter_by == "unassigned")? 'selected':""?>><?php echo  esc_html_e('Unassigned','taskbuilder');?></option>

  • taskbuilder/trunk/includes/admin/projects/wppm_add_new_project.php

    r3210469 r3226189  
    1111$categories = $wpdb->get_results( "SELECT * FROM {$wpdb->prefix}wppm_project_categories ORDER BY $orderby_sql" );
    1212$wppm_current_user_capability = get_user_meta( $current_user->ID, 'wppm_capability', true );
     13$wppm_rich_text_editor = get_option('wppm_rich_text_editor');
     14$wppm_toolbar_actions = get_option('wppm_toolbar_actions');
    1315?>
    1416<form class='wppm_add_new_project wppm_bootstrap' onsubmit="return wppm_create_project();" id="wppm_add_new_project" method="post">
    … …  
    126128        enableTime: <?php echo ($wppm_project_time==1) ? 'true' : 'false' ?>,
    127129        dateFormat: "Y-m-d <?php echo ($wppm_project_time==1) ? 'H:i': '' ?>"
    128     });
    129     tinymce.remove();
    130     tinymce.init({
    131     selector:'#wppm_proj_description',
    132     body_id: 'wppm_proj_description',
    133     directionality : '<?php //echo 'rtl'; ?>',
    134     menubar: false,
    135     statusbar: false,
    136     height : '200',
    137     width  : '100%',
    138     plugins: [
    139         'lists link image directionality paste'
    140     ],
    141     image_advtab: true,
    142     toolbar: 'bold italic underline blockquote | alignleft aligncenter alignright | bullist numlist | rtl | link image',
    143     branding: false,
    144     autoresize_bottom_margin: 20,
    145     browser_spellcheck : true,
    146     relative_urls : false,
    147     paste_as_text: true,
    148     remove_script_host : false,
    149     convert_urls : true,
    150     setup: function (editor) {
    151     }
    152     });
     130    });<?php
     131    if((!empty($wppm_rich_text_editor)) && ($wppm_rich_text_editor == 1)){
     132        $bold = (isset($wppm_toolbar_actions['bold']) && $wppm_toolbar_actions['bold']==1)? 'bold' :"";
     133        $italic = (isset($wppm_toolbar_actions['italic']) && $wppm_toolbar_actions['italic']==1)? 'italic' :"";   
     134        $underline = (isset($wppm_toolbar_actions['underline']) && $wppm_toolbar_actions['underline']==1)?'underline' :"";   
     135        $blockquote = (isset($wppm_toolbar_actions['blockquote']) && $wppm_toolbar_actions['blockquote']==1)? 'blockquote' :"";   
     136        $align = (isset($wppm_toolbar_actions['align']) && $wppm_toolbar_actions['align']==1)?  ' alignleft aligncenter alignright ' :"";   
     137        $bullist = (isset($wppm_toolbar_actions['bullist']) && $wppm_toolbar_actions['bullist']==1)? $bullist = 'bullist' :"";
     138        $numlist = (isset($wppm_toolbar_actions['numlist']) && $wppm_toolbar_actions['numlist']==1)? $numlist = 'numlist' :"";     
     139        $rtl = (isset($wppm_toolbar_actions['rtl']) && $wppm_toolbar_actions['rtl']==1)? $rtl = 'rtl' :"";     
     140        $link = (isset($wppm_toolbar_actions['link']) && $wppm_toolbar_actions['link']==1)? $link = 'link' :"";
     141        $image = (isset($wppm_toolbar_actions['wppm_insert_editor_img']) && $wppm_toolbar_actions['wppm_insert_editor_img']==1)? $image = 'image' :"";     
     142        $forecolor = (isset($wppm_toolbar_actions['forecolor']) && $wppm_toolbar_actions['forecolor']==1)? $forecolor = 'forecolor' :"";
     143        $backcolor = (isset($wppm_toolbar_actions['backcolor']) && $wppm_toolbar_actions['backcolor']==1)? $backcolor = 'backcolor' :"";
     144        $strikethrough = (isset($wppm_toolbar_actions['strikethrough']) && $wppm_toolbar_actions['strikethrough']==1)? $strikethrough = 'strikethrough' :""; ?>
     145        tinymce.remove();
     146        tinymce.init({
     147        selector:'#wppm_proj_description',
     148        body_id: 'wppm_proj_description',
     149        directionality : '<?php //echo 'rtl'; ?>',
     150        menubar: false,
     151        statusbar: false,
     152        height : '200',
     153        width  : '100%',
     154        plugins: [
     155            'lists link image directionality paste textcolor'
     156        ],
     157        image_advtab: true,
     158        toolbar: '<?php echo $bold ?> <?php echo $italic ?> <?php echo $underline ?> <?php echo $blockquote?> | <?php echo $align ?> | <?php echo $bullist ?> <?php echo $numlist ?> | <?php echo $rtl ?> | <?php echo $link ?> <?php echo $image ?> | <?php echo $forecolor?> <?php echo $backcolor?> <?php echo $strikethrough ?>',
     159        branding: false,
     160        autoresize_bottom_margin: 20,
     161        browser_spellcheck : true,
     162        relative_urls : false,
     163        paste_as_text: true,
     164        remove_script_host : false,
     165        convert_urls : true,
     166        setup: function (editor) {
     167        }
     168        });
     169    <?php } ?>
    153170    jQuery("input[name='wppm_assigned_user']").keypress(function(e) {
    154171        //Enter key
    … …  
    214231  }
    215232  var dataform = new FormData(jQuery('#wppm_add_new_project')[0]);
     233  var is_tinymce = (typeof tinyMCE != "undefined") && tinyMCE.activeEditor && !tinyMCE.activeEditor.isHidden();
     234  var description = is_tinymce && tinymce.get('wppm_proj_description') ? tinyMCE.get('wppm_proj_description').getContent() : jQuery('#wppm_proj_description').val().trim();
     235  if (!description) return;
     236  dataform.append('wppm_proj_description', description);
    216237  jQuery('#wppm_project_container').html(wppm_admin.loading_html);
    217   var description = tinyMCE.get('wppm_proj_description').getContent().trim();
    218238  <?php echo do_action('wppm_create_project_dataform');?>
    219   dataform.append('wppm_proj_description', description);
    220239  jQuery.ajax({
    221240    url: wppm_admin.ajax_url,

  • taskbuilder/trunk/includes/admin/projects/wppm_open_project.php

    r3210469 r3226189  
    1010$wppm_tinymce_visibility_open_project = get_option('wppm_tinymce_visibility_open_project');
    1111$settings = get_option("wppm-ap-modal");
     12$wppm_rich_text_editor = get_option('wppm_rich_text_editor');
     13$wppm_toolbar_actions = get_option('wppm_toolbar_actions');
    1214$wppm_current_user_capability = get_user_meta( $current_user->ID, 'wppm_capability', true );
    1315$current_date = date('Y-m-d');
    … …  
    395397          </div>
    396398        </div>
     399      </div>
     400      <div id="wppm_alert_success" class="alert alert-success wppm_alert" style="display:none;" role="alert">
     401        <img src="<?php echo esc_url( WPPM_PLUGIN_URL . 'asset/images/success.svg'); ?>" alt="success"><span class="wppm_alert_text"></span>
     402      </div>
     403      <div id="wppm_alert_error" class="alert alert-danger wppm_alert" style="display:none;" role="alert">
     404        <img src="<?php echo esc_url( WPPM_PLUGIN_URL . 'asset/images/warning-triangle.svg'); ?>" alt="warning-triangle"><span class="wppm_alert_text"></span>
    397405      </div>
    398406      <input type="hidden" id="wppm_proj_nonce" value="<?php echo wp_create_nonce('wppm_upload_proj_attach_file')?>">
    … …  
    443451        },
    444452      });
    445     <?php } ?>
    446     tinymce.remove();
    447     tinymce.init({
    448       selector:'#wppm_proj_description',
    449       body_id: 'wppm_proj_description',
    450       directionality : '<?php //echo 'rtl'; ?>',
    451       menubar: false,
    452       statusbar: false,
    453       height : '200',
    454       plugins: [
    455           'lists link image directionality'
    456       ],
    457       image_advtab: true,
    458       toolbar: 'bold italic underline blockquote | alignleft aligncenter alignright | bullist numlist | rtl | link image',
    459       branding: false,
    460       autoresize_bottom_margin: 20,
    461       browser_spellcheck : true,
    462       relative_urls : false,
    463       remove_script_host : false,
    464       convert_urls : true,
    465       setup: function (editor) {
    466       }
    467     }); <?php
    468     if($wppm_tinymce_visibility_open_project==1){?>
     453    <?php }
     454    if((!empty($wppm_rich_text_editor)) && ($wppm_rich_text_editor == 1)){
     455      $bold = (isset($wppm_toolbar_actions['bold']) && $wppm_toolbar_actions['bold']==1)? 'bold' :"";
     456      $italic = (isset($wppm_toolbar_actions['italic']) && $wppm_toolbar_actions['italic']==1)? 'italic' :"";   
     457      $underline = (isset($wppm_toolbar_actions['underline']) && $wppm_toolbar_actions['underline']==1)?'underline' :"";   
     458      $blockquote = (isset($wppm_toolbar_actions['blockquote']) && $wppm_toolbar_actions['blockquote']==1)? 'blockquote' :"";   
     459      $align = (isset($wppm_toolbar_actions['align']) && $wppm_toolbar_actions['align']==1)?  ' alignleft aligncenter alignright ' :"";   
     460      $bullist = (isset($wppm_toolbar_actions['bullist']) && $wppm_toolbar_actions['bullist']==1)? $bullist = 'bullist' :"";
     461      $numlist = (isset($wppm_toolbar_actions['numlist']) && $wppm_toolbar_actions['numlist']==1)? $numlist = 'numlist' :"";     
     462      $rtl = (isset($wppm_toolbar_actions['rtl']) && $wppm_toolbar_actions['rtl']==1)? $rtl = 'rtl' :"";     
     463      $link = (isset($wppm_toolbar_actions['link']) && $wppm_toolbar_actions['link']==1)? $link = 'link' :"";
     464      $image = (isset($wppm_toolbar_actions['wppm_insert_editor_img']) && $wppm_toolbar_actions['wppm_insert_editor_img']==1)? $image = 'image' :"";     
     465      $forecolor = (isset($wppm_toolbar_actions['forecolor']) && $wppm_toolbar_actions['forecolor']==1)? $forecolor = 'forecolor' :"";
     466      $backcolor = (isset($wppm_toolbar_actions['backcolor']) && $wppm_toolbar_actions['backcolor']==1)? $backcolor = 'backcolor' :"";
     467      $strikethrough = (isset($wppm_toolbar_actions['strikethrough']) && $wppm_toolbar_actions['strikethrough']==1)? $strikethrough = 'strikethrough' :""; ?>
    469468      tinymce.remove();
    470469      tinymce.init({
    471         selector:'#wppm_proj_comment',
    472         body_id: 'wppm_proj_comment',
     470        selector:'#wppm_proj_description',
     471        body_id: 'wppm_proj_description',
    473472        directionality : '<?php //echo 'rtl'; ?>',
    474473        menubar: false,
    475474        statusbar: false,
    476475        height : '200',
    477         width  : '100%',
    478476        plugins: [
    479             'lists link image directionality paste'
     477            'lists link image directionality textcolor'
    480478        ],
    481479        image_advtab: true,
    482         toolbar: 'bold italic underline blockquote | alignleft aligncenter alignright | bullist numlist | rtl | link image',
     480        toolbar: '<?php echo $bold ?> <?php echo $italic ?> <?php echo $underline ?> <?php echo $blockquote?> | <?php echo $align ?> | <?php echo $bullist ?> <?php echo $numlist ?> | <?php echo $rtl ?> | <?php echo $link ?> <?php echo $image ?> | <?php echo $forecolor?> <?php echo $backcolor?> <?php echo $strikethrough ?>',
    483481        branding: false,
    484482        autoresize_bottom_margin: 20,
    … …  
    487485        remove_script_host : false,
    488486        convert_urls : true,
    489         paste_as_text: true,
    490487        setup: function (editor) {
    491488        }
    492       });
     489      }); <?php
     490    }
     491    if($wppm_tinymce_visibility_open_project==1){
     492      if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){
     493        ?>
     494        tinymce.remove();
     495        tinymce.init({
     496          selector:'#wppm_proj_comment',
     497          body_id: 'wppm_proj_comment',
     498          directionality : '<?php //echo 'rtl'; ?>',
     499          menubar: false,
     500          statusbar: false,
     501          height : '200',
     502          width  : '100%',
     503          plugins: [
     504              'lists link image directionality paste textcolor'
     505          ],
     506          image_advtab: true,
     507          toolbar: '<?php echo $bold ?> <?php echo $italic ?> <?php echo $underline ?> <?php echo $blockquote?> | <?php echo $align ?> | <?php echo $bullist ?> <?php echo $numlist ?> | <?php echo $rtl ?> | <?php echo $link ?> <?php echo $image ?> | <?php echo $forecolor?> <?php echo $backcolor?> <?php echo $strikethrough ?>',
     508          branding: false,
     509          autoresize_bottom_margin: 20,
     510          browser_spellcheck : true,
     511          relative_urls : false,
     512          remove_script_host : false,
     513          convert_urls : true,
     514          paste_as_text: true,
     515          setup: function (editor) {
     516          }
     517        });
     518      <?php } ?>
    493519      jQuery('#wppm_proj_comment_btn').show();
    494520  <?php } ?>
    … …  
    496522
    497523function wppm_add_proj_comment(){
     524  <?php
     525  if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){
     526  ?>
    498527  tinymce.remove();
    499528  tinymce.init({
    … …  
    506535    width  : '100%',
    507536    plugins: [
    508         'lists link image directionality paste'
     537        'lists link image directionality paste textcolor'
    509538    ],
    510539    image_advtab: true,
    511     toolbar: 'bold italic underline blockquote | alignleft aligncenter alignright | bullist numlist | rtl | link image',
     540    toolbar: '<?php echo $bold ?> <?php echo $italic ?> <?php echo $underline ?> <?php echo $blockquote?> | <?php echo $align ?> | <?php echo $bullist ?> <?php echo $numlist ?> | <?php echo $rtl ?> | <?php echo $link ?> <?php echo $image ?> | <?php echo $forecolor?> <?php echo $backcolor?> <?php echo $strikethrough ?>',
    512541    branding: false,
    513542    autoresize_bottom_margin: 20,
    … …  
    520549    }
    521550  });
     551  <?php } else{ ?>
     552    jQuery('#wppm_proj_comment').css("width", "100%");
     553    jQuery('#wppm_proj_comment').css("height", "160px");
     554    jQuery('#wppm_proj_comment').css("color", "#000");
     555  <?php }?>
    522556  jQuery('#wppm_proj_comment_btn').show();
     557}
     558
     559function wppm_cancel_proj_comment(){ <?php
     560  if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){
     561  ?>
     562    tinyMCE. activeEditor. setContent('');
     563    tinymce.remove('#wppm_proj_comment');
     564    jQuery('#wppm_proj_comment_btn').hide();
     565  <?php } else{
     566    ?>
     567    jQuery('#wppm_proj_comment').css("width", "80%");
     568    jQuery('#wppm_proj_comment').css("height", "30px");
     569    jQuery('#wppm_proj_comment').css("color", "#000");
     570    jQuery('#wppm_proj_comment').css("padding", "5px");
     571    jQuery('#wppm_proj_comment').css(" margin-bottom", "15px");
     572    jQuery('#wppm_proj_comment').css("overflow", "hidden");
     573    jQuery('#wppm_proj_comment').css("border", "1 px solid #eee");
     574    jQuery('#wppm_proj_comment').css("color", "#eee");
     575    jQuery('#wppm_proj_comment').css("margin-top", "10px");
     576    jQuery('#wppm_proj_comment_btn').hide();
     577  <?php }?>
     578}
     579
     580function wppm_submit_proj_comment(proj_id){
     581  var dataform = new FormData(jQuery('#wppm_open_project')[0]);
     582  dataform.append('action','wppm_submit_proj_comment');
     583  <?php
     584  if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){ ?>
     585    var comment_body = tinyMCE.get('wppm_proj_comment').getContent().trim();
     586  <?php } else{ ?>
     587    var comment_body = jQuery("#wppm_proj_comment").val().trim();
     588  <?php }?>
     589  dataform.append('comment_body',comment_body);
     590  dataform.append('proj_id',proj_id);
     591  jQuery('#wppm_load_individual_project_container').html(wppm_admin.loading_html);
     592  jQuery.ajax({
     593    url: wppm_admin.ajax_url,
     594    type: 'POST',
     595    data: dataform,
     596    processData: false,
     597    contentType: false
     598  })
     599  .done(function (response_str) {
     600      wppm_open_project(proj_id);
     601  });
    523602}
    524603

  • taskbuilder/trunk/includes/admin/settings.php

    r3191970 r3226189  
    2323        <li id="wppm_settings_appearance" role="presentation"><a href="javascript:wppm_get_appearance_settings();"><?php echo esc_html_e('Appearance','taskbuilder');?></a></li>
    2424        <li id="wppm_settings_coworker" role="presentation"><a href="javascript:wppm_get_coworker_permission_settings();"><?php echo esc_html_e('Co-workers Permission','taskbuilder');?></a></li>
     25        <li id="wppm_settings_rich_text_editor" role="presentation"><a href="javascript:wppm_get_rich_text_editor_settings();"><?php echo esc_html_e('Rich Text Editor','taskbuilder');?></a></li>
    2526        <?php do_action('wppm_after_setting_pills');?>
    2627      </ul>

  • taskbuilder/trunk/includes/admin/tasks/open_task/wppm_open_task.php

    r3212866 r3226189  
    1212$wppm_tinymce_visibility_open_task = get_option('wppm_tinymce_visibility_open_task');
    1313$settings = get_option("wppm-ap-modal");
     14$wppm_rich_text_editor = get_option('wppm_rich_text_editor');
     15$wppm_toolbar_actions = get_option('wppm_toolbar_actions');
    1416if (!(($current_user->ID && $current_user->has_cap('manage_options')) || ($wppmfunction->has_permission('view_task',$id)))) {exit;}
    1517$proj_id = isset($_POST) && isset($_POST['proj_id']) ? intval(sanitize_text_field($_POST['proj_id'])) : 0;
    … …  
    618620          }
    619621    }
    620   if($wppm_tinymce_visibility_open_task==1){?>
     622    $bold = (isset($wppm_toolbar_actions['bold']) && $wppm_toolbar_actions['bold']==1)? 'bold' :"";
     623    $italic = (isset($wppm_toolbar_actions['italic']) && $wppm_toolbar_actions['italic']==1)? 'italic' :"";   
     624    $underline = (isset($wppm_toolbar_actions['underline']) && $wppm_toolbar_actions['underline']==1)?'underline' :"";   
     625    $blockquote = (isset($wppm_toolbar_actions['blockquote']) && $wppm_toolbar_actions['blockquote']==1)? 'blockquote' :"";   
     626    $align = (isset($wppm_toolbar_actions['align']) && $wppm_toolbar_actions['align']==1)?  ' alignleft aligncenter alignright ' :"";   
     627    $bullist = (isset($wppm_toolbar_actions['bullist']) && $wppm_toolbar_actions['bullist']==1)? $bullist = 'bullist' :"";
     628    $numlist = (isset($wppm_toolbar_actions['numlist']) && $wppm_toolbar_actions['numlist']==1)? $numlist = 'numlist' :"";     
     629    $rtl = (isset($wppm_toolbar_actions['rtl']) && $wppm_toolbar_actions['rtl']==1)? $rtl = 'rtl' :"";     
     630    $link = (isset($wppm_toolbar_actions['link']) && $wppm_toolbar_actions['link']==1)? $link = 'link' :"";
     631    $image = (isset($wppm_toolbar_actions['wppm_insert_editor_img']) && $wppm_toolbar_actions['wppm_insert_editor_img']==1)? $image = 'image' :"";     
     632    $forecolor = (isset($wppm_toolbar_actions['forecolor']) && $wppm_toolbar_actions['forecolor']==1)? $forecolor = 'forecolor' :"";
     633    $backcolor = (isset($wppm_toolbar_actions['backcolor']) && $wppm_toolbar_actions['backcolor']==1)? $backcolor = 'backcolor' :"";
     634    $strikethrough = (isset($wppm_toolbar_actions['strikethrough']) && $wppm_toolbar_actions['strikethrough']==1)? $strikethrough = 'strikethrough' :"";
     635    if(($wppm_tinymce_visibility_open_task==1)){
     636     if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){
     637      ?>
    621638      tinymce.remove();
    622639      tinymce.init({
    … …  
    629646        width  : '100%',
    630647        plugins: [
    631             'lists link image directionality paste'
     648            'lists link image directionality paste textcolor'
    632649        ],
    633650        image_advtab: true,
    634         toolbar: 'bold italic underline blockquote | alignleft aligncenter alignright | bullist numlist | rtl | link image',
     651        toolbar: '<?php echo $bold ?> <?php echo $italic ?> <?php echo $underline ?> <?php echo $blockquote?> | <?php echo $align ?> | <?php echo $bullist ?> <?php echo $numlist ?> | <?php echo $rtl ?> | <?php echo $link ?> <?php echo $image ?> | <?php echo $forecolor?> <?php echo $backcolor?> <?php echo $strikethrough ?>',
    635652        branding: false,
    636653        autoresize_bottom_margin: 20,
    … …  
    644661      });
    645662      jQuery('#wppm_comment_btn').show();
    646   <?php } ?>
     663      <?php } ?>
     664    <?php } ?>
    647665});
    648666
     667function wppm_cancel_comment(){ <?php
     668  if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){
     669  ?>
     670    tinyMCE. activeEditor. setContent('');
     671    tinymce.remove('#wppm_task_comment');
     672    jQuery('#wppm_comment_btn').hide();
     673  <?php } else{
     674    ?>
     675    jQuery('#wppm_task_comment').css("width", "80%");
     676    jQuery('#wppm_task_comment').css("height", "30px");
     677    jQuery('#wppm_task_comment').css("color", "#000");
     678    jQuery('#wppm_task_comment').css("padding", "5px");
     679    jQuery('#wppm_task_comment').css(" margin-bottom", "15px");
     680    jQuery('#wppm_task_comment').css("overflow", "hidden");
     681    jQuery('#wppm_task_comment').css("border", "1 px solid #eee");
     682    jQuery('#wppm_task_comment').css("color", "#eee");
     683    jQuery('#wppm_task_comment').css("margin-top", "10px");
     684    jQuery('#wppm_comment_btn').hide();
     685  <?php }?>
     686}
     687
    649688function wppm_add_task_comment(){
     689  <?php
     690  if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){
     691  ?>
    650692  tinymce.remove();
    651693  tinymce.init({
    … …  
    658700    width  : '100%',
    659701    plugins: [
    660         'lists link image directionality paste'
     702        'lists link image directionality paste textcolor'
    661703    ],
    662704    image_advtab: true,
    663     toolbar: 'bold italic underline blockquote | alignleft aligncenter alignright | bullist numlist | rtl | link image',
     705    toolbar: '<?php echo $bold ?> <?php echo $italic ?> <?php echo $underline ?> <?php echo $blockquote?> | <?php echo $align ?> | <?php echo $bullist ?> <?php echo $numlist ?> | <?php echo $rtl ?> | <?php echo $link ?> <?php echo $image ?> | <?php echo $forecolor?> <?php echo $backcolor?> <?php echo $strikethrough ?>',
    664706    branding: false,
    665707    autoresize_bottom_margin: 20,
    … …  
    672714    }
    673715  });
     716  <?php } else{ ?>
     717    jQuery('#wppm_task_comment').css("width", "100%");
     718    jQuery('#wppm_task_comment').css("height", "160px");
     719    jQuery('#wppm_task_comment').css("color", "#000");
     720  <?php }?>
    674721  jQuery('#wppm_comment_btn').show();
     722}
     723
     724function wppm_submit_task_comment(id,proj_id){
     725  var dataform = new FormData(jQuery('#wppm_open_task')[0]);
     726  dataform.append('action','wppm_submit_task_comment');
     727  <?php
     728  if(!empty($wppm_rich_text_editor) && ($wppm_rich_text_editor == 1)){ ?>
     729    var comment_body = tinyMCE.get('wppm_task_comment').getContent().trim();
     730  <?php } else{ ?>
     731    var comment_body = jQuery("#wppm_task_comment").val();
     732  <?php }?>
     733  dataform.append('comment_body',comment_body);
     734  dataform.append('task_id',id);
     735  jQuery('#wppm_task_container').html(wppm_admin.loading_html);
     736  jQuery.ajax({
     737    url: wppm_admin.ajax_url,
     738    type: 'POST',
     739    data: dataform,
     740    processData: false,
     741    contentType: false
     742  })
     743  .done(function (response_str) {
     744    if((proj_id!=0)||(proj_id!="")){
     745      wppm_open_project_tasks(id,proj_id);
     746    }else if((proj_id==0)||(proj_id=="")){
     747      wppm_open_task(id);
     748    }
     749  });
    675750}
    676751

  • taskbuilder/trunk/includes/admin/tasks/wppm_add_new_task.php

    r3210469 r3226189  
    77$orderby_prio_sql = esc_sql(sanitize_sql_orderby( "name" ));
    88$cu_id = esc_sql($current_user->ID);
     9$wppm_rich_text_editor = get_option('wppm_rich_text_editor');
     10$wppm_toolbar_actions = get_option('wppm_toolbar_actions');
    911$priorities = $wpdb->get_results( "SELECT * FROM {$wpdb->prefix}wppm_task_priorities ORDER BY '$orderby_prio_sql'" );
    1012$wppm_current_user_capability = get_user_meta( $current_user->ID, 'wppm_capability', true );
    … …  
    208210        dateFormat: "Y-m-d H:i"
    209211        //minDate: startdate
    210     });
    211     tinymce.remove();
    212     tinymce.init({
    213     selector:'#wppm_task_description',
    214     body_id: 'wppm_task_description',
    215     directionality : '<?php //echo 'rtl'; ?>',
    216     menubar: false,
    217     statusbar: false,
    218     height : '200',
    219     width  : '100%',
    220     plugins: [
    221         'lists link image directionality paste'
    222     ],
    223     image_advtab: true,
    224     toolbar: 'bold italic underline blockquote | alignleft aligncenter alignright | bullist numlist | rtl | link image',
    225     branding: false,
    226     autoresize_bottom_margin: 20,
    227     browser_spellcheck : true,
    228     relative_urls : false,
    229     remove_script_host : false,
    230     paste_as_text: true,
    231     convert_urls : true,
    232     setup: function (editor) {
    233     }
    234     });
     212    });<?php
     213    if((!empty($wppm_rich_text_editor)) && ($wppm_rich_text_editor == 1)){
     214        $bold = (isset($wppm_toolbar_actions['bold']) && $wppm_toolbar_actions['bold']==1)? 'bold' :"";
     215        $italic = (isset($wppm_toolbar_actions['italic']) && $wppm_toolbar_actions['italic']==1)? 'italic' :"";   
     216        $underline = (isset($wppm_toolbar_actions['underline']) && $wppm_toolbar_actions['underline']==1)?'underline' :"";   
     217        $blockquote = (isset($wppm_toolbar_actions['blockquote']) && $wppm_toolbar_actions['blockquote']==1)? 'blockquote' :"";   
     218        $align = (isset($wppm_toolbar_actions['align']) && $wppm_toolbar_actions['align']==1)?  ' alignleft aligncenter alignright ' :"";   
     219        $bullist = (isset($wppm_toolbar_actions['bullist']) && $wppm_toolbar_actions['bullist']==1)? $bullist = 'bullist' :"";
     220        $numlist = (isset($wppm_toolbar_actions['numlist']) && $wppm_toolbar_actions['numlist']==1)? $numlist = 'numlist' :"";     
     221        $rtl = (isset($wppm_toolbar_actions['rtl']) && $wppm_toolbar_actions['rtl']==1)? $rtl = 'rtl' :"";     
     222        $link = (isset($wppm_toolbar_actions['link']) && $wppm_toolbar_actions['link']==1)? $link = 'link' :"";
     223        $image = (isset($wppm_toolbar_actions['wppm_insert_editor_img']) && $wppm_toolbar_actions['wppm_insert_editor_img']==1)? $image = 'image' :"";     
     224        $forecolor = (isset($wppm_toolbar_actions['forecolor']) && $wppm_toolbar_actions['forecolor']==1)? $forecolor = 'forecolor' :"";
     225        $backcolor = (isset($wppm_toolbar_actions['backcolor']) && $wppm_toolbar_actions['backcolor']==1)? $backcolor = 'backcolor' :"";
     226        $strikethrough = (isset($wppm_toolbar_actions['strikethrough']) && $wppm_toolbar_actions['strikethrough']==1)? $strikethrough = 'strikethrough' :""; ?>
     227        tinymce.remove();
     228        tinymce.init({
     229        selector:'#wppm_task_description',
     230        body_id: 'wppm_task_description',
     231        directionality : '<?php //echo 'rtl'; ?>',
     232        menubar: false,
     233        statusbar: false,
     234        height : '200',
     235        width  : '100%',
     236        plugins: [
     237            'lists link image directionality paste textcolor'
     238        ],
     239        image_advtab: true,
     240        toolbar: '<?php echo $bold ?> <?php echo $italic ?> <?php echo $underline ?> <?php echo $blockquote?> | <?php echo $align ?> | <?php echo $bullist ?> <?php echo $numlist ?> | <?php echo $rtl ?> | <?php echo $link ?> <?php echo $image ?> | <?php echo $forecolor?> <?php echo $backcolor?> <?php echo $strikethrough ?>',
     241        branding: false,
     242        autoresize_bottom_margin: 20,
     243        browser_spellcheck : true,
     244        relative_urls : false,
     245        remove_script_host : false,
     246        paste_as_text: true,
     247        convert_urls : true,
     248        setup: function (editor) {
     249        }
     250        });
     251    <?php } ?>
    235252    jQuery("input[name='wppm_assign_task_users']").keypress(function(e) {
    236253        //Enter key
    … …  
    295312    <?php do_action('wppm_create_ticket_js_function'); ?>
    296313    var dataform = new FormData(jQuery('#wppm_add_new_task')[0]);
     314    var is_tinymce = (typeof tinyMCE != "undefined") && tinyMCE.activeEditor && !tinyMCE.activeEditor.isHidden();
     315    var description = is_tinymce && tinymce.get('wppm_task_description') ? tinyMCE.get('wppm_task_description').getContent() : jQuery('#wppm_task_description').val().trim();
     316    if (!description) return;
     317    dataform.append('wppm_task_description', description);
    297318    jQuery('#wppm_task_container').html(wppm_admin.loading_html);
    298     var description = tinyMCE.get('wppm_task_description').getContent().trim();
    299     dataform.append('wppm_task_description', description);
    300319    <?php do_action('wppm_create_task_dataform'); ?>
    301320    jQuery.ajax({

  • taskbuilder/trunk/includes/admin/tasks/wppm_tasks_list.php

    r3210469 r3226189  
    8989  $sort_by='task_priorities.name';
    9090}
    91 if($filter_by=='completed'){
     91if($filter_by=='4'){
    9292  $wppm_tl_filter = "Task.status='4'";
    9393}elseif($filter_by=='overdue'){
    … …  
    9595}elseif($filter_by == 'unassigned'){
    9696  $wppm_tl_filter = "Task.users=''";
    97 }elseif($filter_by == 'todo'){
     97}elseif($filter_by == '1'){
    9898  $wppm_tl_filter = "Task.status='1'";
    99 }elseif($filter_by == 'inprogress'){
     99}elseif($filter_by == '2'){
    100100  $wppm_tl_filter = "Task.status='2'";
    101 }elseif($filter_by == 'hold'){
     101}elseif($filter_by == '3'){
    102102  $wppm_tl_filter = "Task.status='3'";
    103103}elseif($filter_by == 'mine'){
    … …  
    208208  $cs_style = "display:none;";
    209209}
     210$todo_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(1)."'" );
     211$inp_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(2)."'" );
     212$hold_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(3)."'" );
     213$completed_status_name = $wpdb->get_var( "SELECT name FROM {$wpdb->prefix}wppm_task_statuses where id='".esc_sql(4)."'" );
     214$todo_status_style = (!empty($todo_status_name))? "display:inline" :"display:none;";
     215$inp_status_style = (!empty($inp_status_name))? "display:inline" :"display:none;";
     216$hold_status_style = (!empty($hold_status_name))? "display:inline" :"display:none;";
     217$completed_status_style = (!empty($completed_status_name))? "display:inline" :"display:none;";
    210218?>
    211219<form id="wppm_task_list_frm">
    … …  
    226234        <select id="wppm_task_filter" name="wppm_task_filter" onchange="wppm_apply_task_filter()">
    227235          <option value="all"<?php echo ($filter_by == "all")? 'selected':""?>><?php echo esc_html_e('All','taskbuilder');?></option>
    228           <option value="todo" <?php echo ($filter_by == "todo")? 'selected':""?>><?php echo  esc_html_e('Todo','taskbuilder');?></option>
    229           <option value="inprogress" <?php echo ($filter_by == "inprogress")? 'selected':""?>><?php echo  esc_html_e('In Progress','taskbuilder');?></option>
    230           <option value="hold" <?php echo ($filter_by == "hold")? 'selected':""?>><?php echo  esc_html_e('Hold','taskbuilder');?></option>
    231           <option value="completed" <?php echo ($filter_by == "completed")? 'selected':""?>><?php echo  esc_html_e('Completed','taskbuilder');?></option>
     236          <option value="1" style="<?php echo $todo_status_style ?>" <?php echo ($filter_by == "1")? 'selected':""?>><?php echo  esc_html_e($todo_status_name,'taskbuilder');?></option>
     237          <option value="2" style="<?php echo $inp_status_style ?>" <?php echo ($filter_by == "2")? 'selected':""?>><?php echo  esc_html_e($inp_status_name,'taskbuilder');?></option>
     238          <option value="3" style="<?php echo $hold_status_style ?>" <?php echo ($filter_by == "3")? 'selected':""?>><?php echo  esc_html_e($hold_status_name,'taskbuilder');?></option>
     239          <option value="4" style="<?php echo $completed_status_style ?>" <?php echo ($filter_by == "4")? 'selected':""?>><?php echo  esc_html_e($completed_status_name,'taskbuilder');?></option>
    232240          <option value="mine" <?php echo ($filter_by == "mine")? 'selected':""?>><?php echo  esc_html_e('Mine','taskbuilder');?></option>
    233241          <option value="unassigned" <?php echo ($filter_by == "unassigned")? 'selected':""?>><?php echo  esc_html_e('Unassigned','taskbuilder');?></option>

  • taskbuilder/trunk/includes/class-wppm-admin.php

    r3191970 r3226189  
    158158      add_action('wp_ajax_wppm_get_coworker_permission_settings',array($this,'wppm_get_coworker_permission_settings'));
    159159      add_action('wp_ajax_wppm_set_coworkers_permission_settings',array($this,'wppm_set_coworkers_permission_settings'));
     160      add_action('wp_ajax_wppm_get_rich_text_editor_settings',array($this,'wppm_get_rich_text_editor_settings'));
     161      add_action('wp_ajax_wppm_set_rich_text_editor_settings',array($this,'wppm_set_rich_text_editor_settings'));
    160162    }
    161163   
    … …  
    10571059    }
    10581060   
     1061    public function wppm_get_rich_text_editor_settings(){
     1062      include WPPM_ABSPATH.'includes/admin/settings/wppm_get_rich_text_editor_settings.php';
     1063      die();
     1064    }
     1065
     1066    public function wppm_set_rich_text_editor_settings(){
     1067      include WPPM_ABSPATH.'includes/admin/settings/wppm_set_rich_text_editor_settings.php';
     1068      die();
     1069    }
     1070   
    10591071  }
    10601072 

  • taskbuilder/trunk/includes/class-wppm-functions.php

    r3210469 r3226189  
    999999            return $user_role;
    10001000        }
     1001
     1002        public static function wppm_toolbar_options_setting() {
     1003            $toolbar = array(
     1004                array(
     1005                    'name'  => esc_attr__( 'Bold', 'taskbuilder' ),
     1006                    'value' => 'bold',
     1007                ),
     1008                array(
     1009                    'name'  => esc_attr__( 'Italic', 'taskbuilder' ),
     1010                    'value' => 'italic',
     1011                ),
     1012                array(
     1013                    'name'  => esc_attr__( 'Underline', 'taskbuilder' ),
     1014                    'value' => 'underline',
     1015                ),
     1016                array(
     1017                    'name'  => esc_attr__( 'Blockquote', 'taskbuilder' ),
     1018                    'value' => 'blockquote',
     1019                ),
     1020                array(
     1021                    'name'  => esc_attr__( 'Align', 'taskbuilder' ),
     1022                    'value' => 'align',
     1023                ),
     1024                array(
     1025                    'name'  => esc_attr__( 'Bulleted list', 'taskbuilder' ),
     1026                    'value' => 'bullist',
     1027                ),
     1028                array(
     1029                    'name'  => esc_attr__( 'Numbered list', 'taskbuilder' ),
     1030                    'value' => 'numlist',
     1031                ),
     1032                array(
     1033                    'name'  => esc_attr__( 'Right to left', 'taskbuilder' ),
     1034                    'value' => 'rtl',
     1035                ),
     1036                array(
     1037                    'name'  => esc_attr__( 'Link', 'taskbuilder' ),
     1038                    'value' => 'link',
     1039                ),
     1040                array(
     1041                    'name'  => esc_attr__( 'Image', 'taskbuilder' ),
     1042                    'value' => 'wppm_insert_editor_img',
     1043                ),
     1044                array(
     1045                    'name'  => esc_attr__( 'Text Color', 'taskbuilder' ),
     1046                    'value' => 'forecolor',
     1047                ),
     1048                array(
     1049                    'name'  => esc_attr__( 'Text Background Color', 'taskbuilder' ),
     1050                    'value' => 'backcolor',
     1051                ),
     1052                array(
     1053                    'name'  => esc_attr__( 'Strikethrough', 'taskbuilder' ),
     1054                    'value' => 'strikethrough',
     1055                ),
     1056            );
     1057            return $toolbar;
     1058        }
    10011059    }
    1002 
    1003 
    10041060endif;
    10051061$GLOBALS['wppmfunction'] =  new WPPM_Functions();

  • taskbuilder/trunk/includes/wppm-install.php

    r3191970 r3226189  
    426426            update_option('wppm_allow_coworkers_change_status', 1);
    427427        }
     428        if($installed_version < '3.0.9'){
     429            update_option('wppm_rich_text_editor',1);
     430            update_option(
     431                'wppm_toolbar_actions',
     432                array(
     433                    'bold'     => '1',
     434                    'italic'    => '1',
     435                    'underline' =>'1',
     436                    'blockquote' =>'1',
     437                    'align'=>'1',
     438                    'bullist'=>'1',
     439                    'numlist'=>'1',
     440                    'rtl'=>'1',
     441                    'link'=>'1',
     442                    'wppm_insert_editor_img'=>'1',
     443                    'forecolor'=>'0',
     444                    'backcolor' => '0',
     445                    'strikethrough' => '0'
     446                )
     447            );
     448        }
    428449        // update wppm_version option to plugin version
    429450        update_option( 'wppm_version', WPPM_VERSION );

  • taskbuilder/trunk/readme.txt

    r3212866 r3226189  
    55Requires at least: 4.4
    66Tested up to: 6.7.1
    7 Stable tag: 3.0.8
     7Stable tag: 3.0.9
    88License: GPL v3
    99
    … …  
    112112
    113113== Changelog ==
     114= V 3.0.9(Jan 21,2025) =
     115* Fix: If status name change from setting, changes not reflect on filter of task list, project list.
     116* New: Rich Text Editor Setting. You can enable/disable Rich Text Editor from setting( Dashboard > projects > Settings > Rich Text Editor).
     117* New(Pro feature): You can rearrange custom fields. By that order, custom fields will display in create task form.
     118
    114119= V 3.0.8(Dec 25,2024) =
    115120* Fix: Attachments not opening in task comment.

  • taskbuilder/trunk/taskbuilder.php

    r3212866 r3226189  
    44 * Plugin URI: https://wordpress.org/plugins/taskbuilder/
    55 * Description: Wordpress Project & Task Management plugin. Easy to keep track of projects & tasks!
    6  * Version: 3.0.8
     6 * Version: 3.0.9
    77 * Author: Taskbuilder Team
    88 * Author URI: https://taskbuilder.net/
    … …  
    2020 
    2121  final class WP_Taskbuilder {
    22     public $version    = '3.0.8';
     22    public $version    = '3.0.9';
    2323    public function __construct() {
    2424      // define global constants
Note: See TracChangeset for help on using the changeset viewer.