Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-06 07:40:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-24 20:51:02 -05:00
parent 5f0c6e508d 1cce38cae6
commit 0580d0c8a3
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/templates.js
View File

@@ -378,7 +378,7 @@
checkConditional(namespace + d, data[d]);
checkConditional('!' + namespace + d, !data[d]);
if (blockInfo) {
if (blockInfo && blockInfo.iterator) {
checkConditional('@first', blockInfo.iterator === 0);
checkConditional('!@first', blockInfo.iterator !== 0);
checkConditional('@last', blockInfo.iterator === blockInfo.total);

5
src/upgrade.js
View File

@@ -306,6 +306,11 @@ Upgrade.upgrade = function(callback) {
updatesMade = true;
Groups.getByGroupName('Administrators', {}, function(err, groupObj) {
if (err && err.message === 'gid-not-found') {
winston.info('[2014/1/23] Updating Administrators Group -- skipped');
return next();
}
Groups.update(groupObj.gid, {
name: 'administrators',
hidden: '1'