IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2146 from vikhyat/badge-system

Browse Source 
Badge creation UI improvements
This commit is contained in:
Sam
2014-03-19 17:11:00 +11:00
parent b7f2a3e512 89d3835d64
commit eab30d1c28
6 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/javascripts/admin/controllers/admin_badges_controller.js
View File

@@ -26,6 +26,14 @@ Discourse.AdminBadgesController = Ember.ArrayController.extend({
**/
canEditDescription: Em.computed.none('selectedItem.translatedDescription'),
/**
Disable saving if the currently selected item is being saved.
@property disableSave
@type {Boolean}
**/
disableSave: Em.computed.alias('selectedItem.saving'),
actions: {
/**
@@ -57,11 +65,9 @@ Discourse.AdminBadgesController = Ember.ArrayController.extend({
@method save
**/
save: function() {
var badge = this.get('selectedItem');
badge.set('disableSave', true);
badge.save().then(function() {
badge.set('disableSave', false);
});
if (!this.get('disableSave')) {
this.get('selectedItem').save();
}
},
/**

6
app/assets/javascripts/admin/controllers/admin_controller.js
View File

@@ -6,4 +6,8 @@
@namespace Discourse
@module Discourse
**/
Discourse.AdminController = Discourse.Controller.extend({});
Discourse.AdminController = Discourse.Controller.extend({
showBadges: function() {
return this.get('currentUser.admin') && Discourse.SiteSettings.enable_badges;
}.property()
});