diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-09-30 02:43:04 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-09-30 02:43:04 -0400 |
| commit | 50da9e3e677f121f15e501bf062da6c45db255ad (patch) | |
| tree | c324d55278fc09ffd18374c014d157969d95d966 | |
| parent | 6ba3c656827c8e1fa84724c6b5dc2ba4f0991ffe (diff) | |
| parent | e4fe87c0a5c3e441b533cdb4e0e85b683e244d3b (diff) | |
merge
| -rw-r--r-- | public/assets/javascripts/ui/editor/EditorSettings.js | 2 | ||||
| -rw-r--r-- | server/lib/middleware.js | 2 | ||||
| -rw-r--r-- | views/staff/_projects.ejs | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js index 92eff2b..8a88f7a 100644 --- a/public/assets/javascripts/ui/editor/EditorSettings.js +++ b/public/assets/javascripts/ui/editor/EditorSettings.js @@ -53,7 +53,7 @@ var EditorSettings = FormView.extend({ } if (data.isNew) { - this.$name.val( "Room " + moment().format("DD/MM/YYYY ha") ) + this.$name.val( "Untitled Room" ) } else { this.thumbnailIsStale() diff --git a/server/lib/middleware.js b/server/lib/middleware.js index b3c9bec..0bf16ce 100644 --- a/server/lib/middleware.js +++ b/server/lib/middleware.js @@ -59,7 +59,7 @@ var middleware = { } next() }) - } + } else { req.project = null next() diff --git a/views/staff/_projects.ejs b/views/staff/_projects.ejs index 9e37a6c..0fdfcf5 100644 --- a/views/staff/_projects.ejs +++ b/views/staff/_projects.ejs @@ -8,11 +8,11 @@ <a href="/project/[[- project.slug ]]">[view]</a> <a href="/project/[[- project.slug ]]/edit">[edit]</a> </td> - [[ if (project.user) { ]] <td> + [[ if (project.user) { ]] <a href="/staff/users/[[- project.user.username ]]">[[- project.user.username ]]</a> - </td> [[ } ]] + </td> <td> [[- project.date ]] </td> |