Skip to content

Commit

Permalink
See pewresearch/pewresearch-org@37407a3 from refs/heads/release/5.0-u…
Browse files Browse the repository at this point in the history
…rl-rewrites
  • Loading branch information
prcdevgitbot committed Mar 7, 2024
1 parent 562f2b6 commit f221a53
Show file tree
Hide file tree
Showing 31 changed files with 2,529 additions and 22,461 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/on-deploy__build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Deploy static ./.docs content to GitHub Pages
on:
# Runs on pushes targeting the default branch
push:
branches: ["main"]
branches: ["develop"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,15 @@ public function execute_block_context( $context, $parsed_block, $parent_block_ob

$query_args = $context['query'] ?? array();

$default_pub_listing_args = apply_filters('prc_platform_pub_listing_default_args', array());

// change the snake_case keys to camelCase
$default_pub_listing_args = array_combine(array_map(function($key) {
return lcfirst(str_replace('_', '', ucwords($key, '_')));
}, array_keys($default_pub_listing_args)), array_values($default_pub_listing_args));

// $query_args['inherit'] = false;

$not_in = array_key_exists('post__not_in', $query_args) ? $query_args['post__not_in'] : array();

$query_args['post__not_in'] = array_merge($not_in, $story_item_ids);
Expand Down
27 changes: 27 additions & 0 deletions includes/datasets/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions includes/decoded/class-decoded.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ public function register_type() {
'label' => __( 'Decoded', 'text_domain' ),
'description' => __( 'A post type for Decoded blog posts.', 'text_domain' ),
'labels' => $labels,
'supports' => array( 'title', 'editor', 'excerpt', 'author', 'thumbnail', 'revisions', 'custom-fields' ),
'taxonomies' => array( 'category', 'research-teams', 'collection', 'languages', 'formats' ),
'supports' => array( 'title', 'editor', 'excerpt', 'author', 'thumbnail', 'revisions' ),
'taxonomies' => array( 'formats' ),
'hierarchical' => false,
'public' => true,
'show_ui' => true,
Expand Down
6 changes: 2 additions & 4 deletions includes/facets/blocks/facets-context-provider/src/block.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
"html": false,
"reusable": false,
"multiple": false,
"interactivity": {
"clientNavigation": true
}
"interactivity": true
},
"usesContext": [
"postType",
Expand All @@ -28,5 +26,5 @@
],
"textdomain": "prc-facets-context-provider",
"editorScript": "file:./index.js",
"viewScriptModule": "file:./view.js"
"viewModule": "file:./view.js"
}
9 changes: 6 additions & 3 deletions includes/gutenberg/class-gutenberg.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ public function load_gutenberg( $use_block_editor, $post ) {
/**
* Enable revisions for reusable blocks.
* @hook init
* @TODO: Look into this, I'm pretty sure a recent Gutenberg release defaulted to this.
*/
public function add_revisions_to_reusable_blocks() {
add_post_type_support( 'wp_block', 'revisions' );
Expand All @@ -92,8 +91,12 @@ public function group_admin_menus_together( $menu_order ) {
$new_menu_order = array();

$reorder = array(
'edit.php?post_type=block_module',
'edit.php?post_type=wp_block',
'edit.php?post_type=topic-page', // Legacy
'edit.php?post_type=template-block', // Legacy
'edit.php?post_type=block_module', // New
'edit.php?post_type=wp_block', // Core Patterns
'edit.php?post_type=blockmeister_pattern', // Block Meister Patterns
'admin.php?page=blockmeister', // Block Meister Settings
);

foreach ( $menu_order as $index => $item ) {
Expand Down
4 changes: 2 additions & 2 deletions includes/homepages/class-homepages.php
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ public function add_front_page_quick_edit( $admin_bar ) {
$admin_bar->remove_menu( 'edit' );
$admin_bar->add_menu(
array(
'id' => 'edit',
'title' => __( 'Edit Homepage' ),
'id' => 'edit-homepage',
'title' => '<span class="ab-icon dashicons dashicons-admin-home"></span>' . _( 'Edit Homepage' ),
'href' => $link,
'meta' => array(
'title' => __( 'Edit Homepage' ),
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('react', 'wp-polyfill'), 'version' => 'cd20458bd88b6f76591f');
<?php return array('dependencies' => array('react', 'wp-polyfill'), 'version' => '2f59ae3aa435c78c9018');
2 changes: 1 addition & 1 deletion includes/icon-loader/build/library-fallback/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion includes/icon-loader/build/library-fallback/index.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion includes/icon-loader/build/loader/index.asset.php
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<?php return array('dependencies' => array('prc-icons', 'wp-dom-ready', 'wp-polyfill'), 'version' => '25bdcad27a663b15e59b');
<?php return array('dependencies' => array('prc-icons', 'wp-dom-ready', 'wp-polyfill'), 'version' => 'aff9620b91e536291f13');
2 changes: 1 addition & 1 deletion includes/icon-loader/build/loader/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion includes/icon-loader/build/loader/index.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit f221a53

Please sign in to comment.