Merge branch 'xdmod8.5' into add_report_thumbnail_portlet3

ubccr · Jul 12, 2019 · 7b15ac3 · 7b15ac3
2 parents 463ad93 + e0f06e4
commit 7b15ac3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/classes/Rest/Controllers/SummaryControllerProvider.php b/classes/Rest/Controllers/SummaryControllerProvider.php
@@ -280,9 +280,12 @@ public function getRoleReport(Request $request, Application $app)
             }
             return $app->json(array(
                 'success' => true,
-                'total' => 1,
+                'total' => count($data),
+                'data' => $data
+            ));
+        }
     }
-    /*          
+    /*
     * Get stored value for if a user should view the help tour or not
     */
     public function getViewedUserTour(Request $request, Application $app)

diff --git a/configuration/etl/etl.d/xdmod-migration-8_1_2-8_5_0.json b/configuration/etl/etl.d/xdmod-migration-8_1_2-8_5_0.json
@@ -147,4 +147,4 @@
             "truncate_destination": true
         }
     ]
-}
+}