Merge pull request #398 from creativecommons/chapter-mb-fix

Fix Chapter lead issues on chapters metabox & view

Author: hugosolar

themes/cc-commoners-2019/archive-cc_chapters.php

@@ -29,7 +29,7 @@
                                 <div class="inline-container">
                                     <h3 class="chapter-title"></h3>
                                     <div class="chapter-metadata">
-                                        <p>Chapter lead: <span class="chapter-lead-name"></span></p>
+                                        <p class="chaper-lead-container">Chapter lead: <span class="chapter-lead-name"></span></p>
                                         <p><small>founded on <em class="chapter-date"></em> </small></p>
                                     </div>
                                     <a href="#" class="button warning more">More information</a>

themes/cc-commoners-2019/assets/js/commoners-chapters.js

@@ -6,7 +6,18 @@ jQuery(document).ready(function($){
     var writeInfoBox = function (value) {
         info_box.find('.chapter-title').html(value.name);
         info_box.find('.chapter-date').html(value.date);
-        info_box.find('.chapter-lead-name').html(value.chapter_lead);
+        if (value.chapter_lead != null) {
+            var chapter_lead_string = '';
+            $('.chaper-lead-container').show();
+            if (Array.isArray(value.chapter_lead)) {
+                chapter_lead_string = value.chapter_lead.join(', ');
+            } else {
+                chapter_lead_string = value.chapter_lead;
+            }
+            info_box.find('.chapter-lead-name').html(chapter_lead_string);
+        } else {
+            $('.chaper-lead-container').hide();
+        }
         info_box.find('.button.more').attr('href',value.link);
     }
 

themes/cc-commoners-2019/inc/custom-post-type/queulat-cc-chapters-cpt-plugin/class-cc-chapters-metabox.php

@@ -161,8 +161,10 @@ public function get_fields() : array
                     'properties' => [
                         'instance' => [
                             'width' => '100%',
-                            'multiple' => false,
+                            'multiple' => true,
                             'minimumInputLength' => 3,
+                            'allowClear' => true,
+                            'placeholder' => 'Select',
                             'ajax' => [
                                 'url' => admin_url('admin-ajax.php?action=event-metabox__search-members&chapter_id=' . get_the_ID()),
                             ]
@@ -200,6 +202,8 @@ public function get_fields() : array
                             'width' => '100%',
                             'multiple' => false,
                             'minimumInputLength' => 3,
+                            'allowClear' => true,
+                            'placeholder' => 'Select',
                             'ajax' => [
                                 'url' => admin_url('admin-ajax.php?action=event-metabox__search-members&chapter_id=' . get_the_ID()),
                             ]

themes/cc-commoners-2019/inc/site.php

@@ -57,12 +57,21 @@ public static function get_chapters_by_status() {
         $results = [];
         if ($query->have_posts()) {
             foreach ($query->posts as $post) {
+                $chapter_lead = get_post_meta($post->ID, 'cc_chapters_chapter_lead',false);
+                $chapter_lead_name = '';
+                if (count($chapter_lead) > 1) {
+                    foreach ($chapter_lead as $member_id) {
+                        $chapter_lead_name[] = get_user_by('id', $member_id)->display_name;
+                    }
+                } else {
+                    $chapter_lead_name = get_user_by('id', $chapter_lead[0])->display_name;
+                }
                 $single_chapter = [];
                 $single_chapter['name'] = $post->post_title;
                 $single_chapter['link'] = get_permalink( $post->ID );
                 $single_chapter['date'] = $post->cc_chapters_date;
                 $single_chapter['email'] = $post->cc_chapters_email;
-                $single_chapter['chapter_lead'] = get_user_by('id', $post->cc_chapters_chapter_lead)->display_name;
+                $single_chapter['chapter_lead'] = $chapter_lead_name;
                 $single_chapter['member_gnc'] = get_user_by('id', $post->cc_chapters_member_gnc)->display_name;
                 $single_chapter['country_code'] = $post->cc_chapters_chapter_country;
                 $single_chapter['url'] = $post->cc_chapters_url;

themes/cc-commoners-2019/single-cc_chapters.php

@@ -15,9 +15,9 @@
                 <section class="entry-meta chapter-metadata">
                     <?php 
                         global $post;
+                        $chapter_lead = get_post_meta($post->ID, 'cc_chapters_chapter_lead',false);
                         $date_founded = $post->cc_chapters_date;
                         $chapter_mail = $post->cc_chapters_email;
-                        $chapter_lead = $post->cc_chapters_chapter_lead;
                         $member_gnc = $post->cc_chapters_member_gnc;
                         $external_url = $post->cc_chapters_url;
                         $chapter_url = $post->cc_chapters_chapter_url;
@@ -64,9 +64,11 @@
                          ?>
                     </div>
                     <?php 
-                        echo '<div class="grid-x grid-margin-x large-up-2 medium-up-2">';
+                        echo '<div class="grid-x grid-margin-x grid-margin-y large-up-2 medium-up-2">';
                             if ( !empty( $chapter_lead ) ) {
-                                echo render::chapter_member($chapter_lead, 'Chapter Lead');
+                                foreach ($chapter_lead as $chapter_lead_id) {
+                                    echo render::chapter_member($chapter_lead_id, 'Chapter Lead');
+                                }
                             }
                             if ( !empty( $member_gnc ) ) {
                                 echo render::chapter_member($member_gnc, 'Representative to the Global Network Council');