support public dashboards

Stunjelly · Sep 20, 2015 · 60293dc · 60293dc
1 parent d799ce8
commit 60293dc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/public/partial/home/home.html b/public/partial/home/home.html
@@ -23,6 +23,11 @@ <h1 class="text-center">openboard</h1>
             </section>
             <section class="public-dashboards">
               <p><strong>Public Dashboards</strong></p>
+              <ul class="list-unstyled">
+                <li ng-repeat="dashboard in publicDashboards track by dashboard.id">
+                  <a ui-sref="dashboard({dashboardId:dashboard.id})">{{dashboard.title}}</a>
+                </li>
+              </ul>
               <p ng-if="!publicDashboards.length" class="text-muted">We couldn't find any public dashboards.</p>
             </section>
           </div>

diff --git a/public/partial/home/home.js b/public/partial/home/home.js
@@ -2,6 +2,8 @@ angular.module('openboard').controller('HomeCtrl', function ($scope, Dashboard,
 
   $scope.dashboards = Dashboard.query();
 
+  $scope.publicDashboards = Dashboard.query({'public': 1});
+
   $scope.schema = {
     type: "object",
     properties: {

diff --git a/routes/dashboards.js b/routes/dashboards.js
@@ -5,12 +5,8 @@ var async = require('async');
 var allowedKeys = ['title', 'public', 'theme', 'customStyle', 'columns'];
 
 exports.findAll = function (req, res) {
-  db.Dashboard.findAll({
-    where: {userId: req.ntlm.UserName},
-    order: [
-      ['createdAt', 'DESC']
-    ]
-  }).then(function (entities) {
+  var q = req.query.public === '1' ? {where: {public: true}} : {where: {userId: req.ntlm.UserName}};
+  db.Dashboard.findAll(q).then(function (entities) {
     return res.json(entities);
   }, function (err) {
     return res.send(500, err);
@@ -20,7 +16,7 @@ exports.findAll = function (req, res) {
 exports.find = function (req, res) {
   db.Dashboard.findById(req.param('dashboardId')).then(function (entity) {
     if (!entity) return res.send(404);
-    if (entity.userId !== req.ntlm.UserName) return res.send(403);
+    if (entity.public !== true && entity.userId !== req.ntlm.UserName) return res.send(403);
     return res.json(entity);
   })
 };
@@ -39,9 +35,9 @@ exports.create = function (req, res) {
 };
 
 exports.update = function (req, res) {
-  var query = {where: {id: req.param('dashboardId'), userId: req.ntlm.UserName}};
-  db.Dashboard.find(query).then(function (entity) {
+  db.Dashboard.findById(req.param('dashboardId')).then(function (entity) {
     if (!entity) return res.send(404);
+    if (entity.userId !== req.ntlm.UserName) return res.send(403);
     var update = _.pick(req.body, allowedKeys);
     entity.updateAttributes(update).then(function (entity) {
       res.json(entity)
@@ -50,7 +46,7 @@ exports.update = function (req, res) {
 };
 
 exports.destroy = function (req, res) {
-  db.Dashboard.find({where: {id: req.param('dashboardId')}}).then(function (entity) {
+  db.Dashboard.findById(req.param('dashboardId')).then(function (entity) {
     if (!entity) return res.send(404);
     if (entity.userId !== req.ntlm.UserName) return res.send(403);
     entity.destroy().then(function () {

diff --git a/routes/widgets.js b/routes/widgets.js
@@ -19,7 +19,7 @@ exports.findAll = function (req, res) {
 exports.find = function (req, res) {
   db.Dashboard.findById(req.param('dashboardId'), {attributes: ['id', 'userId']}).then(function (dashboard) {
     if (!dashboard) return res.send(404);
-    if (dashboard.userId !== req.ntlm.UserName) return res.send(403);
+    if (dashboard.public !== true && dashboard.userId !== req.ntlm.UserName) return res.send(403);
     db.Widget.find({where: {id: req.param('widgetId'), dashboardId: dashboard.id}}).then(function (entity) {
       return !entity ? res.json(entity) : res.send(404);
     }, function (err) {