removed the fields

v1.18.x
Baris Usakli 12 years ago
parent 4335f8c5c6
commit f2bf65252d

@ -312,20 +312,20 @@
function checkConditional(key, value) { function checkConditional(key, value) {
var conditional = makeConditionalRegex(key), var conditional = makeConditionalRegex(key),
conditionalBlock = conditional.exec(template); conditionalBlock = conditional.exec(template);
if (conditionalBlock !== null) { if (conditionalBlock !== null) {
conditionalBlock = conditionalBlock[0].split(/<!-- ELSE -->/); conditionalBlock = conditionalBlock[0].split(/<!-- ELSE -->/);
if (conditionalBlock[1]) { if (conditionalBlock[1]) {
// there is an else statement // there is an else statement
if (!value) { if (!value) {
template = template.replace(conditional, conditionalBlock[1]); template = template.replace(conditional, conditionalBlock[1]);
} else { } else {
template = template.replace(conditional, conditionalBlock[0]); template = template.replace(conditional, conditionalBlock[0]);
} }
} else { } else {
// regular if // regular if
if (!value) { if (!value) {
template = template.replace(conditional, ''); template = template.replace(conditional, '');
} }
@ -335,13 +335,13 @@
checkConditional(namespace + d, data[d]); checkConditional(namespace + d, data[d]);
checkConditional('!' + namespace + d, !data[d]); checkConditional('!' + namespace + d, !data[d]);
if (blockInfo) { if (blockInfo) {
checkConditional('@first', blockInfo.iterator === 0); checkConditional('@first', blockInfo.iterator === 0);
checkConditional('@last', blockInfo.iterator === blockInfo.total); checkConditional('@last', blockInfo.iterator === blockInfo.total);
} }
template = replace(namespace + d, data[d], template); template = replace(namespace + d, data[d], template);
} }
} }

@ -66,7 +66,7 @@
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-sm btn-default follow main-post" type="button" title="Be notified of new replies in this topic"><i class="fa fa-eye"></i></button> <button class="btn btn-sm btn-default follow main-post" type="button" title="Be notified of new replies in this topic"><i class="fa fa-eye"></i></button>
<button class="favourite btn btn-sm btn-default <!-- IF posts.favourited --> btn-warning <!-- ENDIF posts.favourited -->" type="button"> <button class="favourite btn btn-sm btn-default " type="button">
<span class="favourite-text">[[topic:favourite]]</span> <span class="favourite-text">[[topic:favourite]]</span>
<span class="post_rep_{posts.pid}">{posts.reputation} </span> <span class="post_rep_{posts.pid}">{posts.reputation} </span>

@ -55,14 +55,6 @@ var RDB = require('./redis'),
'editor': '', 'editor': '',
'edited': 0, 'edited': 0,
'deleted': 0 'deleted': 0
//TODO : write upgrade script to remove these fields from the database -barisu
//'fav_button_class': '',
//'fav_star_class': 'fa-star-o',
//'show_banned': 'hide',
//'relativeTime': new Date(timestamp).toISOString(),
//'post_rep': '0',
//'edited-class': 'none',
//'relativeEditTime': ''
}; };
RDB.hmset('post:' + pid, postData); RDB.hmset('post:' + pid, postData);

Loading…
Cancel
Save