Sotaro KARASAWA 11 лет назад
Родитель
Сommit
f051bfb042
3 измененных файлов с 3 добавлено и 4 удалено
  1. 0 1
      lib/routes/page.js
  2. 1 1
      lib/views/_form.html
  3. 2 2
      package.json

+ 0 - 1
lib/routes/page.js

@@ -10,7 +10,6 @@ module.exports = function(app) {
     , actions = {};
 
   function getPathFromRequest(req) {
-    console.log(req.params);
     var path = '/' + (req.params[0] || '');
     return path;
   }

+ 1 - 1
lib/views/_form.html

@@ -18,7 +18,7 @@
       <div class="form-submit-group form-group form-inline">
         <select name="pageForm[grant]" class="form-control">
           {% for grantId, grantLabel in consts.pageGrants %}
-          <option value="{{ grantId }}" {% if (pageForm.grant && grantId == pageForm.grant) || (page.grant == grantId ) %}selected{% endif %}>{{ grantLabel }}</option>
+          <option value="{{ grantId }}" {% if pageForm.grant|default(page.grant) == grantId %}selected{% endif %}>{{ grantLabel }}</option>
           {% endfor %}
         </select>
 

+ 2 - 2
package.json

@@ -33,7 +33,7 @@
     "cli": "~0.6.0",
     "connect-flash": "~0.1.1",
     "connect-redis": "^2.1.0",
-    "consolidate": "=0.10.0",
+    "consolidate": "~0.11.0",
     "cookie-parser": "^1.3.4",
     "debug": "~2.1.0",
     "errorhandler": "^1.3.4",
@@ -60,7 +60,7 @@
     "redis": "~0.12.1",
     "socket.io": "~1.3.0",
     "socket.io-client": "~1.3.0",
-    "swig": "=1.3.2",
+    "swig": "~1.4.0",
     "time": "~0.11.0"
   },
   "devDependencies": {