diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-09-10 10:01:10 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-09-10 10:01:10 -0400 |
| commit | a8d3a30892687f58e3f18b768104ea54480cd465 (patch) | |
| tree | 1c1f2651310c5c495ce817bb4a52b52c018c1f0d | |
| parent | 139448ff9376a34d0fe6d8d69035e97a75172155 (diff) | |
| parent | 00a14b6411c480ba4f5f086cea90f50f930c23f1 (diff) | |
merge
| -rw-r--r-- | server/lib/middleware.js | 1 | ||||
| -rw-r--r-- | server/lib/views/index.js | 2 | ||||
| -rw-r--r-- | views/staff/projects/show.ejs | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/server/lib/middleware.js b/server/lib/middleware.js index 9790f8f..b3c9bec 100644 --- a/server/lib/middleware.js +++ b/server/lib/middleware.js @@ -69,6 +69,7 @@ var middleware = { ensureIsCollaborator: function(req, res, next) { req.isCollaborator = false req.isOwner = false + req.isStaff = true if (! req.user || ! req.project) { next() diff --git a/server/lib/views/index.js b/server/lib/views/index.js index e8f8d37..29b84d8 100644 --- a/server/lib/views/index.js +++ b/server/lib/views/index.js @@ -35,7 +35,7 @@ views.editor = function (req, res) { if (! req.project) { res.redirect('/') } - else if (req.isOwner || req.isCollaborator) { + else if (req.isOwner || req.isCollaborator || req.isStaff) { res.render('editor') } else { diff --git a/views/staff/projects/show.ejs b/views/staff/projects/show.ejs index 0fdb00b..bd23784 100644 --- a/views/staff/projects/show.ejs +++ b/views/staff/projects/show.ejs @@ -47,7 +47,7 @@ <table id="iframe-embed" class="projectList"> <tr> <td class="border"> - <iframe src="/project/fafafa/view?noui=1&mute=1" class="embed"></iframe> + <iframe src="/project/[[- project.slug ]]/view?noui=1&mute=1" class="embed"></iframe> </td> </tr> </table> |