mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-01-06 15:42:52 +01:00
differentiate between rid and id
This commit is contained in:
@@ -20,8 +20,8 @@ define('admin/extend/rewards', function() {
|
||||
});
|
||||
|
||||
$('.delete').on('click', function() {
|
||||
var parent = $(this).parents('[data-index]'),
|
||||
id = parent.attr('data-index');
|
||||
var parent = $(this).parents('[data-id]'),
|
||||
id = parent.attr('data-id');
|
||||
|
||||
delete active[id];
|
||||
// send delete api call
|
||||
@@ -33,7 +33,7 @@ define('admin/extend/rewards', function() {
|
||||
$('.toggle').on('click', function() {
|
||||
var btn = $(this),
|
||||
disabled = btn.html() === 'Enable',
|
||||
id = $(this).parents('[data-index]').attr('data-index');
|
||||
id = $(this).parents('[data-id]').attr('data-id');
|
||||
|
||||
btn.toggleClass('btn-warning').toggleClass('btn-success').html(disabled ? 'Enable' : 'Disable');
|
||||
// send disable api call
|
||||
@@ -48,7 +48,7 @@ define('admin/extend/rewards', function() {
|
||||
function select(el) {
|
||||
el.val(el.attr('data-selected'));
|
||||
switch (el.attr('name')) {
|
||||
case 'id':
|
||||
case 'rid':
|
||||
selectReward(el);
|
||||
break;
|
||||
}
|
||||
@@ -57,23 +57,23 @@ define('admin/extend/rewards', function() {
|
||||
function update(el) {
|
||||
el.attr('data-selected', el.val());
|
||||
switch (el.attr('name')) {
|
||||
case 'id':
|
||||
case 'rid':
|
||||
selectReward(el);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
function selectReward(el) {
|
||||
var parent = el.parents('[data-id]'),
|
||||
var parent = el.parents('[data-rid]'),
|
||||
div = parent.find('.inputs'),
|
||||
inputs,
|
||||
html = '';
|
||||
|
||||
for (var reward in available) {
|
||||
if (available.hasOwnProperty(reward)) {
|
||||
if (available[reward].id === el.attr('data-selected')) {
|
||||
if (available[reward].rid === el.attr('data-selected')) {
|
||||
inputs = available[reward].inputs;
|
||||
parent.attr('data-id', available[reward].id);
|
||||
parent.attr('data-rid', available[reward].rid);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -105,7 +105,7 @@ define('admin/extend/rewards', function() {
|
||||
}
|
||||
|
||||
function populateInputs() {
|
||||
$('[data-id]').each(function(i) {
|
||||
$('[data-rid]').each(function(i) {
|
||||
var div = $(this).find('.inputs'),
|
||||
rewards = active[i].rewards;
|
||||
|
||||
@@ -121,8 +121,8 @@ define('admin/extend/rewards', function() {
|
||||
var ul = $('#active'),
|
||||
li = $('#active li').last().clone(true);
|
||||
|
||||
li.attr('data-index', parseInt(li.attr('data-index') + 1, 10))
|
||||
.attr('data-id', '');
|
||||
li.attr('data-id', parseInt(li.attr('data-id') + 1, 10))
|
||||
.attr('data-rid', '');
|
||||
|
||||
li.find('.inputs').html('');
|
||||
li.find('[name="reward"]').val('');
|
||||
@@ -147,6 +147,7 @@ define('admin/extend/rewards', function() {
|
||||
data.rewards[obj.name] = obj.value;
|
||||
});
|
||||
|
||||
data.id = $(this).attr('data-id');
|
||||
data.disabled = $(this).find('.toggle').html() === 'Enable';
|
||||
|
||||
activeRewards.push(data);
|
||||
|
||||
@@ -31,7 +31,11 @@ var defaults = {
|
||||
};
|
||||
|
||||
rewards.save = function(data, callback) {
|
||||
|
||||
data.forEach(function(reward) {
|
||||
if (reward.disabled) {
|
||||
//db.setAdd
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
rewards.get = function(callback) {
|
||||
@@ -59,7 +63,7 @@ rewards.get = function(callback) {
|
||||
rewards: function(next) {
|
||||
plugins.fireHook('filter:rewards.rewards', [
|
||||
{
|
||||
"id": "core:add-to-group",
|
||||
"rid": "core:add-to-group",
|
||||
"name": "Add to Group",
|
||||
"inputs": [
|
||||
{
|
||||
@@ -84,7 +88,7 @@ rewards.get = function(callback) {
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "core:alert-user",
|
||||
"rid": "core:alert-user",
|
||||
"name": "Send alert message",
|
||||
"inputs": [
|
||||
{
|
||||
@@ -111,7 +115,8 @@ function getConditions() {
|
||||
function getActiveRewards(callback) {
|
||||
callback(false, [
|
||||
{
|
||||
"id": "core:alert-user",
|
||||
"id": 0,
|
||||
"rid": "core:alert-user",
|
||||
"condition": "postcount",
|
||||
"conditional": "greaterthan",
|
||||
"rewards": {
|
||||
@@ -122,7 +127,8 @@ function getActiveRewards(callback) {
|
||||
"disabled": false
|
||||
},
|
||||
{
|
||||
"id": "core:add-to-group",
|
||||
"id": 1,
|
||||
"rid": "core:add-to-group",
|
||||
"condition": "lastLoggedIn",
|
||||
"conditional": "lesserthan",
|
||||
"rewards": {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<div class="panel-body">
|
||||
<ul id="active">
|
||||
<!-- BEGIN active -->
|
||||
<li data-id="{active.id}" data-index="@index">
|
||||
<li data-rid="{active.rid}" data-id="{active.id}">
|
||||
<form class="main inline-block">
|
||||
<div class="well inline-block">
|
||||
<label for="condition">If User's</label><br />
|
||||
@@ -26,9 +26,9 @@
|
||||
</div>
|
||||
<div class="well inline-block">
|
||||
<label for="condition">Then:</label><br />
|
||||
<select name="id" data-selected="{active.id}">
|
||||
<select name="rid" data-selected="{active.rid}">
|
||||
<!-- BEGIN rewards -->
|
||||
<option value="{rewards.id}">{rewards.name}</option>
|
||||
<option value="{rewards.rid}">{rewards.name}</option>
|
||||
<!-- END rewards -->
|
||||
</select>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user