Skip to content

fix #177, add view/edit link, reduce unnecessary requests #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scottmeng wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix #177, add view/edit link, reduce unnecessary requests #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85d2c46
fix #177, add view/edit link, reduce unnecessary requests
scottmeng Apr 23, 2014
c94ca01
fix past tense error
scottmeng Apr 28, 2014
3b6528c
add new line between functions
scottmeng Apr 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 32 additions & 15 deletions src/media/js/views/review.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,37 @@ define('views/review',
function(format, log, notification, requests, urls, utils, z) {

var console = log('review');
var pastTense = {'approve': 'approved',
'reject': 'rejected',
'disable': 'disabled',
'delete': 'deleted'};

function capitalise(string) {
return string.charAt(0).toUpperCase() + string.slice(1);
}

function successMessage(statusVerb, game) {
var params = {game: game};
switch (statusVerb) {
case 'approve': return gettext('Approved game: {game}', params);
case 'reject': return gettext('Rejected game: {game}', params);
case 'disable': return gettext('Disabled game: {game}', params);
case 'delete': return gettext('Deleted game: {game}', params);
default: return '';
var params = {verb: capitalise(pastTense[statusVerb]), game: game};
if (statusVerb) {
return gettext('{verb} game: {game}', params);
}
return '';
}

function failureMessage(statusVerb, game) {
var params = {game: game};
switch (statusVerb) {
case 'approve': return gettext('Failed to approve game: {game}', params);
case 'reject': return gettext('Failed to reject game: {game}', params);
case 'disable': return gettext('Failed to disable game: {game}', params);
case 'delete': return gettext('Failed to delete game: {game}', params);
default: return '';
var params = {verb: statusVerb, game: game};
if (statusVerb) {
return gettext('Failed to {verb} game: {game}', params);
}
return '';
}

function invalidMessage(statusVerb, game) {
var params = {verb: pastTense[statusVerb], game: game};
if (statusVerb) {
return gettext('{game} is already {verb}', params);
}
return '';
}

function submitStatusChange($game, $button, statusVerb) {
Expand Down Expand Up @@ -79,7 +90,13 @@ define('views/review',
var $this = $(this);
var $game = $this.closest('[data-game-slug]');
var statusVerb = $this.data('statusVerb');
submitStatusChange($game, $this, statusVerb);
var currentStatus = $('#select-status').val();
if (currentStatus.indexOf(statusVerb) > -1) {
var message = invalidMessage(statusVerb, $game.data('gameTitle'));
notification.notification({message: message});
} else {
submitStatusChange($game, $this, statusVerb);
}
}).on('change', '#select-status', function() {
var params = {status: this.value};
z.page.trigger('navigate', utils.urlparams(urls.reverse('review'), params));
Expand Down
4 changes: 2 additions & 2 deletions src/templates/admin/review.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ <h3 class="game-date-title">{{ _('Date submitted:') }}</h3>
<div class="btn-text">{{ _('Reject') }}</div>
</a>
<div class="secondary-buttons">
<a class="btn-secondary-view hint--right" data-hint="{{ _('View') }}">
<a class="btn-secondary-view hint--right" data-hint="{{ _('View') }}" href="{{ url('game', [game.slug]) }}">
<div class="btn-text fa fa-desktop"></div>
</a>
<a class="btn-secondary-edit hint--right" data-hint="{{ _('Edit') }}">
<a class="btn-secondary-edit hint--right" data-hint="{{ _('Edit') }}" href="{{ url('edit_game', [game.slug]) }}">
<div class="btn-text fa fa-edit"></div>
</a>
<a class="btn-secondary-delete hint--right" data-status-verb="delete" data-hint="{{ _('Delete') }}">
Expand Down