Apply change from commit e3c48ca

- Fixed error when Staff Member did not contain a photo.
brettshumaker · Mar 16, 2021 · 70ed491 · 70ed491
1 parent e8f2484
commit 70ed491
Show file tree

Hide file tree

Showing 6 changed files with 857 additions and 8 deletions.
diff --git a/trunk/admin/css/blocks.editor.css b/trunk/admin/css/blocks.editor.css
@@ -1,2 +1,8 @@
-.wp-block-simple-staff-list-static .sorry.warning{background:#7668ce;color:white;font-size:1.2rem}
-.wp-block-simple-staff-list-static .sorry.warning{background:#7668ce;color:white;font-size:1.2rem}
+.wp-block-simple-staff-list-static .sorry.warning {
+  background: #7668ce;
+  color: white;
+  font-size: 1.2rem; }
+.wp-block-simple-staff-list-static .sorry.warning {
+  background: #7668ce;
+  color: white;
+  font-size: 1.2rem; }
diff --git a/trunk/admin/js/editor.blocks.js b/trunk/admin/js/editor.blocks.js
diff --git a/trunk/blocks/components/PostSelector/index.js b/trunk/blocks/components/PostSelector/index.js
@@ -215,7 +215,7 @@ class PostSelector extends Component {
         date: response.date,
         type: response.type,
 		status: response.status,
-		media: response._embedded['wp:featuredmedia'][0]
+		media: response._embedded && response._embedded['wp:featuredmedia'] ? response._embedded['wp:featuredmedia'][0] : null
       };
       // send data to the block;
 	  this.props.onPostSelect(fullpost);

diff --git a/trunk/blocks/single-staff-member-legacy/index.js b/trunk/blocks/single-staff-member-legacy/index.js
@@ -63,7 +63,7 @@ export default registerBlockType(
                 date: response.date,
                 type: response.type,
                 status: response.status,
-                media: response._embedded['wp:featuredmedia'][0]
+                media: response._embedded && response._embedded['wp:featuredmedia'] ? response._embedded['wp:featuredmedia'][0] : null
               };
               // send data to the block;
               setAttributes({

diff --git a/trunk/blocks/single-staff-member/index.js b/trunk/blocks/single-staff-member/index.js
@@ -123,7 +123,7 @@ export default registerBlockType(
                 date: response.date,
                 type: response.type,
                 status: response.status,
-                media: response._embedded['wp:featuredmedia'][0]
+                media: response._embedded && response._embedded['wp:featuredmedia'] ? response._embedded['wp:featuredmedia'][0] : null
               };
               // send data to the block;
               setAttributes({

diff --git a/trunk/public/css/blocks.style.css b/trunk/public/css/blocks.style.css
@@ -1,2 +1,26 @@
-.entry-content .wp-block-jsforwpblocks-static,.wp-block-jsforwpblocks-static{background:rgba(254,243,224,0.52);border:5px #f7b733 solid;padding:1rem}.entry-content .wp-block-jsforwpblocks-static h2,.wp-block-jsforwpblocks-static h2{color:#222;font-size:2rem;margin:1rem 0}.entry-content .wp-block-jsforwpblocks-static p,.wp-block-jsforwpblocks-static p{font-size:1.4rem}
-.entry-content .wp-block-jsforwpblocks-static,.wp-block-jsforwpblocks-static{background:rgba(254,243,224,0.52);border:5px #f7b733 solid;padding:1rem}.entry-content .wp-block-jsforwpblocks-static h2,.wp-block-jsforwpblocks-static h2{color:#222;font-size:2rem;margin:1rem 0}.entry-content .wp-block-jsforwpblocks-static p,.wp-block-jsforwpblocks-static p{font-size:1.4rem}
+.entry-content .wp-block-jsforwpblocks-static,
+.wp-block-jsforwpblocks-static {
+  background: rgba(254, 243, 224, 0.52);
+  border: 5px #f7b733 solid;
+  padding: 1rem; }
+  .entry-content .wp-block-jsforwpblocks-static h2,
+  .wp-block-jsforwpblocks-static h2 {
+    color: #222;
+    font-size: 2rem;
+    margin: 1rem 0; }
+  .entry-content .wp-block-jsforwpblocks-static p,
+  .wp-block-jsforwpblocks-static p {
+    font-size: 1.4rem; }
+.entry-content .wp-block-jsforwpblocks-static,
+.wp-block-jsforwpblocks-static {
+  background: rgba(254, 243, 224, 0.52);
+  border: 5px #f7b733 solid;
+  padding: 1rem; }
+  .entry-content .wp-block-jsforwpblocks-static h2,
+  .wp-block-jsforwpblocks-static h2 {
+    color: #222;
+    font-size: 2rem;
+    margin: 1rem 0; }
+  .entry-content .wp-block-jsforwpblocks-static p,
+  .wp-block-jsforwpblocks-static p {
+    font-size: 1.4rem; }