From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 19 Sep 2018 18:25:35 +0000 (-0400)
Subject: Throwing the addon data into a more widely scoped array to also include addon name... 
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=0eadbfa3657fdca200447cf3dd53c112e7dfc242;p=WP-Plugins%2Fglm-member-db.git

Throwing the addon data into a more widely scoped array to also include addon name and slug, etc
---

diff --git a/models/admin/newDashboard/index.php b/models/admin/newDashboard/index.php
index 570458c1..e5d9a52a 100644
--- a/models/admin/newDashboard/index.php
+++ b/models/admin/newDashboard/index.php
@@ -192,7 +192,12 @@ class GlmMembersAdmin_newDashboard_index extends GlmDataMembers
         // May be able to avoid sending the (huge) Config array to the view
         foreach ( $this->config[ 'addOns' ] as $a ) {
             if ( has_filter( $a['slug'] . "-dashboard-widget") ) {
-                $widgetData[] = apply_filters($a['slug'] . "-dashboard-widget", "");
+                //var_dump($a);
+                $addonData[$a['slug']]['name'] = $a['short_name'];
+                $addonData[$a['slug']]['slug'] = $a['slug'];
+                $addonData[$a['slug']]['index'] = $a['index'];
+                $addonData[$a['slug']]['widgetData'] = apply_filters($a['slug'] . "-dashboard-widget", "");
+                
             } else {
                 echo "<br>" . $a['slug'] .  " has no filter called " . $a['slug'] . "-dashboard-widget";
                 //$widgetData[] = $a['slug'];
@@ -213,7 +218,8 @@ class GlmMembersAdmin_newDashboard_index extends GlmDataMembers
             'clickThroughCounts' => $clickThroughCounts,
             'detailViewCounts'   => $detailViewCounts,
             'statusPending'      => $this->config['status_numb']['Pending'],
-            'widgetData'         => $widgetData,
+            //'widgetData'         => $addonData['widgetData'],
+            'addonData'          => $addonData,
         );
 
         // Return status, suggested view, and data to controller.
diff --git a/views/admin/newDashboard/index.html b/views/admin/newDashboard/index.html
index af626a35..62bf0417 100644
--- a/views/admin/newDashboard/index.html
+++ b/views/admin/newDashboard/index.html
@@ -4,10 +4,9 @@
         <div class="glm-summary-widgets">
             <div class="row">
                 <div class="glm-summary-widget col s12 m6 l4">
-                    {foreach $widgetData as $w}
+                    {foreach $addonData as $widgetData}
                         {include file='./summaryWidget.html'}
                     {/foreach}
-                    
                 </div>
             </div>
         </div>
diff --git a/views/admin/newDashboard/summaryWidget.html b/views/admin/newDashboard/summaryWidget.html
index 74135139..b375cee0 100644
--- a/views/admin/newDashboard/summaryWidget.html
+++ b/views/admin/newDashboard/summaryWidget.html
@@ -1,7 +1,10 @@
 <ul id="members-summary-widget" class="summary members-summary-widget dashboard-summary-widget collapsible">
     <li>
-        <div class="summary-widget-handle collapsible-header"><pre> {$w|var_dump} </pre></div>
+        <div class="summary-widget-handle collapsible-header"><pre> {$widgetData.name}</pre></div>
         <div class="summary-widget-body collapsible-body">
+            {foreach $widgetData as $widgetField}
+                {$widgetField|var_dump}
+            {/foreach}
             <div class="quicklinks">
                 <a href="#">Dashboard</a>
                 <span>&nbsp;|&nbsp;</span>