Changeset 2878694

Timestamp:

03/12/2023 02:52:29 PM (3 years ago)

Author:

wptableeditor

Message:

Small bug fixes

Location:

wp-table-editor/trunk

Files:

• assets/css/front.css (modified) (1 diff)
• includes/admin/function.php (modified) (2 diffs)
• includes/admin/row_action.php (modified) (1 diff)
• includes/admin/table_action.php (modified) (1 diff)
• includes/init.php (modified) (1 diff)
• includes/load.php (modified) (5 diffs)
• includes/public/row_action.php (modified) (1 diff)
• includes/public/shortcode.php (modified) (3 diffs)
• main.php (modified) (2 diffs)
• readme.txt (modified) (4 diffs)

wp-table-editor/trunk/assets/css/front.css

@@ -42 +42 @@
 }
 /*new*/
+.xscontainer table, td, th {
+    border: unset;
+}
 .xscontainer .xs-row {
     padding:10px !important;

wp-table-editor/trunk/includes/admin/function.php

@@ -148 +148 @@
                 table_jsonnametemp varchar(250) NOT NULL,
                 table_jsonsavedate varchar(250) NOT NULL,
+                table_datasources enum('default','javascript') NOT NULL,
                 table_note text NOT NULL,
                 table_keytable enum('no','yes') NOT NULL,
@@ -1200 +1201 @@
             $html_id = "wptableeditor_$table_id";
             $dataSet = '';
-            if($serverSide === 'false' && $table_type === 'json' && empty($column_index)){
+            if($serverSide === 'false' && $table_type === 'json' && empty($column_index) && $table_filter !== 'yes'){
                 $dataSet = wptableeditor_load::put_action($table_id, false, true);
             }

wp-table-editor/trunk/includes/admin/row_action.php

@@ -110 +110 @@
                     }elseif($order_types[$x] === 'id'){
                         $sub_array[] = $row['column_id'];
+                    }elseif($order_types[$x] === 'select'){
+                        if($value === 'dashicons dashicons-yes'){
+                            $sub_array[] = html_entity_decode('<span class="dashicons dashicons-yes" style="color: green;font-weight: 600;font-size: 25px"></span>');
+                        }elseif($value === 'dashicons dashicons-no'){
+                            $sub_array[] = html_entity_decode('<span class="dashicons dashicons-no" style="color: red;font-size: 25px"></span>');
+                        }else{
+                            $sub_array[] = html_entity_decode($value);
+                        }
                     }else{
                         $sub_array[] = html_entity_decode($value);

wp-table-editor/trunk/includes/admin/table_action.php

@@ -50 +50 @@
         wptableeditor_init::add_column(WPTABLEEDITOR_TABLE, 'table_staterestore', "text", 'table_predefinedstates');
         wptableeditor_init::rename_column(WPTABLEEDITOR_TABLE, 'table_responsive', 'table_responsive', "enum('collapse','scroll','flip','stack')");
+        wptableeditor_init::add_column(WPTABLEEDITOR_TABLE, 'table_datasources', "enum('default', 'javascript')", 'table_jsonsavedate');
         $query = "SELECT * FROM `{$WPTABLEEDITOR_TABLE}` ";
         $result = $wpdb->get_results($query);

wp-table-editor/trunk/includes/init.php

@@ -23 +23 @@
             }elseif($table === 'table_createdrow'){
                 $$table = stripslashes(maybe_unserialize(''));
+            }elseif($table === 'table_datasources'){
+                $$table = 'default';
             }
         }

wp-table-editor/trunk/includes/load.php

@@ -105 +105 @@
                     'table_prefilter',
                     'table_jsonsave',
-                    'table_autosave'
+                    'table_autosave',
+                    'table_datasources'
                 );
             }
@@ -125 +126 @@
             $result = $wpdb->get_results($wpdb->prepare($query, $table_id));
             if($result){
+                $license = self::license();
                 $output = array();
                 for($i = 1; $i <= 44; $i++){
@@ -180 +182 @@
                         }
                         $output14[] = $row->column_names;
+                        $column_names = '"title": "'.$row->column_names.'",';
                         if($row->column_width > 0){
-                            $output15[] = '{ "width": "'.$row->column_width.'%" }';
-                            $output36[] = '{ "width": "'.$row->column_width.'%","data": "'.str_replace('column_', '', $row->column_name).'" }';
+                            $output15[] = '{ '.$column_names.'"width": "'.$row->column_width.'%" }';
+                            $output36[] = '{ '.$column_names.'"width": "'.$row->column_width.'%","data": "'.str_replace('column_', '', $row->column_name).'" }';
                         }else{
-                            $output15[] = 'null';
-                            $output36[] = '{ "data": "'.str_replace('column_', '', $row->column_name).'" }';
+                            $output15[] = '{ "title": "'.$row->column_names.'" }';
+                            $output36[] = '{ '.$column_names.'"data": "'.str_replace('column_', '', $row->column_name).'" }';
                         }
                         if(!empty($row->column_backgroundcolor)){
@@ -205 +208 @@
                             $output18[$row->column_order] = $row->column_customtype;
                         }
-                        if($row->column_index === 'yes'){
+                        if($license !== false && $row->column_index === 'yes'){
                             $output19[] = $row->column_order;
                         }
@@ -325 +328 @@
                     }
                 }
-                if(self::license() === false){
+                if($license === false){
                     $outputs19 = array();
                     $outputs21 = array();

wp-table-editor/trunk/includes/public/row_action.php

@@ -102 +102 @@
                             }elseif($order_types[$x] === 'id'){
                                 $sub_array[] = $row['column_id'];
+                            }elseif($order_types[$x] === 'select'){
+                                if($value === 'dashicons dashicons-yes'){
+                                    $sub_array[] = html_entity_decode('<span class="dashicons dashicons-yes" style="color: green;font-weight: 600;font-size: 25px"></span>');
+                                }elseif($value === 'dashicons dashicons-no'){
+                                    $sub_array[] = html_entity_decode('<span class="dashicons dashicons-no" style="color: red;font-size: 25px"></span>');
+                                }else{
+                                    $sub_array[] = html_entity_decode($value);
+                                }
                             }else{
                                 $sub_array[] = html_entity_decode($value);

wp-table-editor/trunk/includes/public/shortcode.php

@@ -366 +366 @@
                 }
                 $dataSet = '';
-                if($serverSide === 'false' && empty($column_index)){
+                if($table_type === 'json'){
                     $dataSet = wptableeditor_load::put_action($table_id, false, true);
                 }
@@ -555 +555 @@
                 $output .= '<table class="stripe xs-w-100 xs-b-spacing xs-m-bottom" id="'.$html_id.'">';
                     $output .= '<thead class="'.$html_id.'_thead"><tr class="'.$html_id.'_head">';
+                    if(empty($dataSet)){
                         $i = 0;
                         $output .= '<th class="'.$html_id.'_head_'.$i.'">ID</th>';
@@ -564 +565 @@
                             $output .= '<th class="'.$html_id.'_head_'.$i.'"></th>';
                         }
+                    }
                     $output .= '</tr></thead>';
                     $output .= '<tbody class="'.$html_id.'_tbody"></tbody>';
-                    if($table_footer === 'yes'){
+                    if($table_footer === 'yes' && empty($dataSet)){
                         $i = 0;
                         $output .= '<tfoot class="'.$html_id.'_tfoot"><tr class="'.$html_id.'_foot">';

wp-table-editor/trunk/main.php

@@ -4 +4 @@
 Plugin URI: https://wptableeditor.com/documentation/
 Description: Table Editor is a WordPress plugin used to quickly create tables from Excel, CSV, JSON and other data sources. Allows you to create beautiful sortable and responsive tables inside your posts, pages, custom post types or widget area.
-Version: 1.3.1
+Version: 1.3.2
 Author: wptableeditor.com
 Author URI: https://wptableeditor.com/
@@ -15 +15 @@
 if ( ! defined( 'WPTABLEEDITOR_ASSETS' ) ) define( 'WPTABLEEDITOR_ASSETS', plugins_url( 'assets/', __FILE__ ) );
 if ( ! defined( 'WPTABLEEDITOR_VENDOR' ) ) define( 'WPTABLEEDITOR_VENDOR', plugins_url( 'vendor/', __FILE__ ) );
-if ( ! defined( 'WPTABLEEDITOR_VERSION' ) ) define( 'WPTABLEEDITOR_VERSION', '1.3.1' );
+if ( ! defined( 'WPTABLEEDITOR_VERSION' ) ) define( 'WPTABLEEDITOR_VERSION', '1.3.2' );
 if ( ! defined( 'WPTABLEEDITOR_SLUG' ) ) define( 'WPTABLEEDITOR_SLUG', basename( plugin_dir_path( __FILE__ ) ) );
 if ( ! defined( 'WPTABLEEDITOR_MAIN' ) ) define( 'WPTABLEEDITOR_MAIN', plugin_basename( __FILE__ ) );

wp-table-editor/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.1.1
 Requires PHP: 7.4
-Stable tag: 1.3.1
+Stable tag: 1.3.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -14 +14 @@
 
 Table Editor is a WordPress plugin used to quickly create tables from Excel, CSV, JSON and other data sources. Allows you to create beautiful sortable and responsive tables inside your posts, pages, custom post types or widget area.
-
+[Live Demo](https://wptableeditor.com/demos/)
 [Live Admin](https://tastewp.com/plugins/wp-table-editor?ni=true)
 
@@ -27 +27 @@
 - Google Sheets
 
-Please visit the plugin website at [wptableeditor.com](https://wptableeditor.com/documentation/) for more information or a [demo](https://wptableeditor.com/demo).
+Please visit the plugin website at [wptableeditor.com](https://wptableeditor.com/documentation/) for more information or a [demo](https://wptableeditor.com/demos).
 
 Here is the list of the [feature](https://wptableeditor.com/features/)
@@ -74 +74 @@
 
 == Changelog ==
+
+= 1.3.2 =
+* Small bug fixes
 
 = 1.3.1 =