Fixes #118

claudioc · Dec 28, 2015 · b821a9c · b821a9c
1 parent 2ae0e2c
commit b821a9c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -9,6 +9,7 @@ Version 1.6.0, December 28th, 2015
 - Adds the CONTRIBUTING file
 - Adds more tests
 - Fixes a TOC bug (@creynold)
+- Fixes #118
 - Fixes a crash on a certain git configuration
 
 Requires `npm install`

diff --git a/lib/models.js b/lib/models.js
@@ -256,7 +256,9 @@ Page.prototype.fetch = function (extended) {
 
   if (!extended) {
     return Promiserr.all([this.fetchContent(),
-                        this.fetchMetadata()]);
+                        this.fetchMetadata(),
+                        this.fetchHashes(1)
+                        ]);
   }
   else {
     return Promiserr.all([this.fetchContent(),
@@ -344,7 +346,9 @@ Page.prototype.fetchMetadata = function () {
   }.bind(this));
 };
 
-Page.prototype.fetchHashes = function () {
+Page.prototype.fetchHashes = function (howmany) {
+
+  howmany = howmany || 2;
 
   return new Promiserr(function (resolve, reject) {
 
@@ -353,7 +357,7 @@ Page.prototype.fetchHashes = function () {
       return;
     }
 
-    gitmech.hashes(this.filename, 2, function (err, hashes) {
+    gitmech.hashes(this.filename, howmany, function (err, hashes) {
 
       this.lastCommand = "hashes";
 

diff --git a/public/css/style.css b/public/css/style.css
@@ -268,7 +268,7 @@ hr {
 }
 
 .alert {
-  box-shadow: 0 0 5px silver;
+  border: 1px solid #E8E2BF;
   border-radius: 0;
 }
 

diff --git a/routes/wiki.js b/routes/wiki.js
@@ -84,7 +84,7 @@ function _getWikiPage(req, res) {
     if (!page.error) {
 
       res.locals.canEdit = true;
-      if (page.revision != "HEAD") {
+      if (page.revision !== "HEAD" && page.revision != page.hashes[0]) {
         res.locals.warning = "You're not reading the latest revision of this page, which is " + "<a href='" + page.urlForShow() + "'>here</a>.";
         res.locals.canEdit = false;
       }