differentiate between rid and id

v1.18.x
psychobunny 10 years ago
parent 67b693cd3a
commit e5115c0cf2

@ -20,8 +20,8 @@ define('admin/extend/rewards', function() {
}); });
$('.delete').on('click', function() { $('.delete').on('click', function() {
var parent = $(this).parents('[data-index]'), var parent = $(this).parents('[data-id]'),
id = parent.attr('data-index'); id = parent.attr('data-id');
delete active[id]; delete active[id];
// send delete api call // send delete api call
@ -33,7 +33,7 @@ define('admin/extend/rewards', function() {
$('.toggle').on('click', function() { $('.toggle').on('click', function() {
var btn = $(this), var btn = $(this),
disabled = btn.html() === 'Enable', 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'); btn.toggleClass('btn-warning').toggleClass('btn-success').html(disabled ? 'Enable' : 'Disable');
// send disable api call // send disable api call
@ -48,7 +48,7 @@ define('admin/extend/rewards', function() {
function select(el) { function select(el) {
el.val(el.attr('data-selected')); el.val(el.attr('data-selected'));
switch (el.attr('name')) { switch (el.attr('name')) {
case 'id': case 'rid':
selectReward(el); selectReward(el);
break; break;
} }
@ -57,23 +57,23 @@ define('admin/extend/rewards', function() {
function update(el) { function update(el) {
el.attr('data-selected', el.val()); el.attr('data-selected', el.val());
switch (el.attr('name')) { switch (el.attr('name')) {
case 'id': case 'rid':
selectReward(el); selectReward(el);
break; break;
} }
} }
function selectReward(el) { function selectReward(el) {
var parent = el.parents('[data-id]'), var parent = el.parents('[data-rid]'),
div = parent.find('.inputs'), div = parent.find('.inputs'),
inputs, inputs,
html = ''; html = '';
for (var reward in available) { for (var reward in available) {
if (available.hasOwnProperty(reward)) { if (available.hasOwnProperty(reward)) {
if (available[reward].id === el.attr('data-selected')) { if (available[reward].rid === el.attr('data-selected')) {
inputs = available[reward].inputs; inputs = available[reward].inputs;
parent.attr('data-id', available[reward].id); parent.attr('data-rid', available[reward].rid);
break; break;
} }
} }
@ -105,7 +105,7 @@ define('admin/extend/rewards', function() {
} }
function populateInputs() { function populateInputs() {
$('[data-id]').each(function(i) { $('[data-rid]').each(function(i) {
var div = $(this).find('.inputs'), var div = $(this).find('.inputs'),
rewards = active[i].rewards; rewards = active[i].rewards;
@ -121,8 +121,8 @@ define('admin/extend/rewards', function() {
var ul = $('#active'), var ul = $('#active'),
li = $('#active li').last().clone(true); li = $('#active li').last().clone(true);
li.attr('data-index', parseInt(li.attr('data-index') + 1, 10)) li.attr('data-id', parseInt(li.attr('data-id') + 1, 10))
.attr('data-id', ''); .attr('data-rid', '');
li.find('.inputs').html(''); li.find('.inputs').html('');
li.find('[name="reward"]').val(''); li.find('[name="reward"]').val('');
@ -147,6 +147,7 @@ define('admin/extend/rewards', function() {
data.rewards[obj.name] = obj.value; data.rewards[obj.name] = obj.value;
}); });
data.id = $(this).attr('data-id');
data.disabled = $(this).find('.toggle').html() === 'Enable'; data.disabled = $(this).find('.toggle').html() === 'Enable';
activeRewards.push(data); activeRewards.push(data);

@ -31,7 +31,11 @@ var defaults = {
}; };
rewards.save = function(data, callback) { rewards.save = function(data, callback) {
data.forEach(function(reward) {
if (reward.disabled) {
//db.setAdd
}
});
}; };
rewards.get = function(callback) { rewards.get = function(callback) {
@ -59,7 +63,7 @@ rewards.get = function(callback) {
rewards: function(next) { rewards: function(next) {
plugins.fireHook('filter:rewards.rewards', [ plugins.fireHook('filter:rewards.rewards', [
{ {
"id": "core:add-to-group", "rid": "core:add-to-group",
"name": "Add to Group", "name": "Add to Group",
"inputs": [ "inputs": [
{ {
@ -84,7 +88,7 @@ rewards.get = function(callback) {
] ]
}, },
{ {
"id": "core:alert-user", "rid": "core:alert-user",
"name": "Send alert message", "name": "Send alert message",
"inputs": [ "inputs": [
{ {
@ -111,7 +115,8 @@ function getConditions() {
function getActiveRewards(callback) { function getActiveRewards(callback) {
callback(false, [ callback(false, [
{ {
"id": "core:alert-user", "id": 0,
"rid": "core:alert-user",
"condition": "postcount", "condition": "postcount",
"conditional": "greaterthan", "conditional": "greaterthan",
"rewards": { "rewards": {
@ -122,7 +127,8 @@ function getActiveRewards(callback) {
"disabled": false "disabled": false
}, },
{ {
"id": "core:add-to-group", "id": 1,
"rid": "core:add-to-group",
"condition": "lastLoggedIn", "condition": "lastLoggedIn",
"conditional": "lesserthan", "conditional": "lesserthan",
"rewards": { "rewards": {

@ -5,7 +5,7 @@
<div class="panel-body"> <div class="panel-body">
<ul id="active"> <ul id="active">
<!-- BEGIN 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"> <form class="main inline-block">
<div class="well inline-block"> <div class="well inline-block">
<label for="condition">If User's</label><br /> <label for="condition">If User's</label><br />
@ -26,9 +26,9 @@
</div> </div>
<div class="well inline-block"> <div class="well inline-block">
<label for="condition">Then:</label><br /> <label for="condition">Then:</label><br />
<select name="id" data-selected="{active.id}"> <select name="rid" data-selected="{active.rid}">
<!-- BEGIN rewards --> <!-- BEGIN rewards -->
<option value="{rewards.id}">{rewards.name}</option> <option value="{rewards.rid}">{rewards.name}</option>
<!-- END rewards --> <!-- END rewards -->
</select> </select>
</div> </div>

Loading…
Cancel
Save