Skip to content

Commit b806647

Browse files
shridhamdevelopershridhamdeveloper
authored
Merge pull request #2286 from ahmedkaludi/1.44
1.44
2 parents 8338dff + 82b2704 commit b806647

27 files changed

+2218
-203
lines changed

‎admin_section/class-saswp-fields-generator.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,10 @@ public function saswp_field_generator( $meta_fields, $settings, $field_type = nu
491491

492492
$hiddenvalue ="";
493493

494+
if ( isset( $hidden['id'] ) && ! isset( $settings[ $hidden['id'] ] ) && $hidden['id'] == 'saswp_author_schema' ) {
495+
$hiddenvalue = 1;
496+
}
497+
494498
if(array_key_exists('id', $hidden) && isset($settings[$hidden['id']]) ) {
495499

496500
$hiddenvalue = $settings[$hidden['id']];

‎admin_section/common-function.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2013,6 +2013,8 @@ function saswp_fields_and_type($data_type = 'value'){
20132013
'saswp_archive_schema' => array('type' => 'checkbox', 'value' => 0),
20142014
'saswp_archive_list_type' => array('type' => 'select', 'value' => 'CollectionPage'),
20152015
'saswp_archive_schema_type' => array('type' => 'select', 'value' => 'Article'),
2016+
'saswp_author_schema' => array('type' => 'checkbox', 'value' => 1),
2017+
'saswp_author_schema_type' => array('type' => 'select', 'value' => 'Person'),
20162018
'saswp_woocommerce_archive' => array('type' => 'checkbox', 'value' => 1),
20172019
'saswp_woocommerce_archive_list_type' => array('type' => 'select', 'value' => 'DetailedItemList'),
20182020
'saswp_breadcrumb_schema' => array('type' => 'checkbox', 'value' => 0),
@@ -2025,6 +2027,7 @@ function saswp_fields_and_type($data_type = 'value'){
20252027

20262028
// Knowledge Graph Settings
20272029
'saswp_kb_type' => array('type' => 'select', 'value' => 'Organization'),
2030+
'saswp_kb_schema_type' => array('type' => 'select', 'value' => 'Person'),
20282031
'saswp_organization_type' => array('type' => 'select', 'value' => ''),
20292032
'sd_name' => array('type' => 'text', 'value' => $sd_name),
20302033
'sd_alt_name' => array('type' => 'text', 'value' => $sd_name),

‎admin_section/css/main-style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ clear: both;
387387
label[for="saswp_archive_schema_type"] {
388388
padding-left: 10px !important;
389389
}
390-
label[for="saswp_archive_list_type"] {
390+
label[for="saswp_archive_list_type"], label[for="saswp_author_schema_type"] {
391391
padding-left: 10px !important;
392392
}
393393
label[for="saswp-single-price-type"] {

‎admin_section/css/main-style.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎admin_section/js/functions-list.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300
schema_type = jQuery(".saswp-tab-links.selected").attr('saswp-schema-type');
301301
}
302302

303-
if(schema_type === 'Review' || schema_type === 'ReviewNewsArticle'){
303+
if ( schema_type === 'Review' || schema_type === 'ReviewNewsArticle' || schema_type === 'CriticReview' ) {
304304
var current = jQuery(this);
305305
saswp_item_reviewed_ajax(schema_type, current);
306306

@@ -352,7 +352,7 @@
352352
var schema_type = jQuery('select#schema_type option:selected').val();
353353
var schema_subtype = '';
354354

355-
if(schema_type == 'Review' || schema_type == 'ReviewNewsArticle'){
355+
if ( schema_type == 'Review' || schema_type == 'ReviewNewsArticle' || schema_type == 'CriticReview' ) {
356356
schema_subtype = jQuery('select.saswp-item-reivewed-list option:selected').val();
357357
}
358358

@@ -362,7 +362,7 @@
362362
if(schema_type == 'ReviewNewsArticle'){
363363
html += '<optgroup label="ReviewNewsArticle">';
364364
}
365-
if(schema_type == 'Review'){
365+
if ( schema_type == 'Review' || schema_type == 'CriticReview' ) {
366366
html += '<optgroup label="Review">';
367367
html += '<option value="saswp_review_name">Review Name</option>';
368368
html += '<option value="saswp_review_description">Review Description</option>';
@@ -379,15 +379,15 @@
379379

380380
}
381381

382-
if(schema_type == 'Review'){
382+
if ( schema_type == 'Review' || schema_type == 'CriticReview' ) {
383383
html += '<optgroup label="'+schema_subtype+'">';
384384
}
385385

386386
jQuery.each(fields, function(key,value){
387387
html += '<option value="'+key+'">'+value+'</option>';
388388
});
389389

390-
if(schema_type == 'Review' || schema_type == 'ReviewNewsArticle'){
390+
if ( schema_type == 'Review' || schema_type == 'ReviewNewsArticle' || schema_type == 'CriticReview' ) {
391391
html += '</optgroup>';
392392
}
393393

‎admin_section/js/functions-list.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎admin_section/js/main-script.js

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,7 @@ jQuery(document).ready(function($){
629629
|| schematype == 'Product'
630630
|| schematype == 'Review'
631631
|| schematype == 'VacationRental'
632+
|| schematype == 'CriticReview'
632633

633634
){
634635

@@ -659,7 +660,7 @@ jQuery(document).ready(function($){
659660
$(".saswp-event-text-field-tr").show();
660661
$(".saswp-option-table-class tr").find('select').attr('disabled', false);
661662
}
662-
if(schematype == 'Review' || schematype == 'ReviewNewsArticle'){
663+
if(schematype == 'Review' || schematype == 'ReviewNewsArticle' || schematype == 'CriticReview'){
663664
$(".saswp-review-text-field-tr").show();
664665
$(".saswp-option-table-class tr").find('select').attr('disabled', false);
665666
$(".saswp-item-reivewed-list").change();
@@ -784,7 +785,7 @@ jQuery(document).ready(function($){
784785
$("#saswp_location_meta_box").removeClass('saswp_hide');
785786
}
786787

787-
if(schematype == 'Review' || schematype == 'ReviewNewsArticle'){
788+
if(schematype == 'Review' || schematype == 'ReviewNewsArticle' || schematype == 'CriticReview'){
788789
$(".saswp-review-text-field-tr").show();
789790
$(".saswp-review-text-field-tr").find('select').attr('disabled', false);
790791
}
@@ -1052,6 +1053,17 @@ jQuery(document).ready(function($){
10521053
$(".saswp_archive_list_type_class").parent().parent().hide();
10531054
}
10541055
break;
1056+
1057+
case 'saswp_author_schema_checkbox':
1058+
1059+
if ($(this).is(':checked')) {
1060+
$("#saswp_author_schema").val(1);
1061+
$(".saswp_author_schema_type_class").parent().parent().show();
1062+
}else{
1063+
$("#saswp_author_schema").val(0);
1064+
$(".saswp_author_schema_type_class").parent().parent().hide();
1065+
}
1066+
break;
10551067

10561068
case 'saswp_website_schema_checkbox':
10571069

@@ -3709,7 +3721,7 @@ jQuery(document).ready(function($){
37093721
var schema_subtype = '';
37103722
var field_name = null;
37113723

3712-
if(schema_type == 'Review'){
3724+
if(schema_type == 'Review' || schema_type == 'CriticReview'){
37133725
schema_subtype = $('select.saswp-item-reivewed-list option:selected').val();
37143726
field_name = 'saswp_review_name';
37153727
}

‎admin_section/js/main-script.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎admin_section/js/saswp-add-new.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ jQuery(document).ready(function($) {
269269
$('.select-post-type').val('show_globally').trigger('change');
270270
}
271271

272-
if(schematype == 'Review' || schematype == 'ReviewNewsArticle'){
272+
if(schematype == 'Review' || schematype == 'ReviewNewsArticle' || schematype == 'CriticReview'){
273273
$(".saswp-review-text-field-tr").show();
274274
$(".saswp-option-table-class tr").find('select').attr('disabled', false);
275275
}
@@ -302,7 +302,7 @@ jQuery(document).ready(function($) {
302302
$(".saswp-"+businesstype+'-tr').find('select').attr('disabled', false);
303303
}
304304

305-
if(schematype == 'Review' || schematype == 'ReviewNewsArticle'){
305+
if(schematype == 'Review' || schematype == 'ReviewNewsArticle' || schematype == 'CriticReview'){
306306
$(".saswp-review-text-field-tr").show();
307307
$(".saswp-review-text-field-tr").find('select').attr('disabled', false);
308308
}

0 commit comments

Comments
 (0)