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

Adds support for a description to user fields.

Browse Source
This commit is contained in:
Robin Ward
2014-10-02 15:56:28 -04:00
parent 295a3c108e
commit 381814fd5d
22 changed files with 157 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/admin/controllers/admin-user-field-item.js.es6
View File

@@ -13,14 +13,18 @@ export default Ember.ObjectController.extend(BufferedContent, {
save: function() {
var self = this;
var attrs = this.get('buffered').getProperties('name', 'field_type', 'editable');
var attrs = this.get('buffered').getProperties('name', 'description', 'field_type', 'editable');
this.get('model').save(attrs).then(function(res) {
self.set('model.id', res.user_field.id);
self.set('editing', false);
self.commitBuffer();
}).catch(function() {
bootbox.alert(I18n.t('generic_error'));
}).catch(function(e) {
var msg = I18n.t("generic_error");
if (e.responseJSON && e.responseJSON.errors) {
msg = I18n.t("generic_error_with_reason", {error: e.responseJSON.errors.join('. ')});
}
bootbox.alert(msg);
});
},

5
app/assets/javascripts/admin/controllers/admin-user-fields.js.es6
View File

@@ -3,6 +3,11 @@ import UserField from 'admin/models/user-field';
export default Ember.ArrayController.extend({
fieldTypes: null,
createDisabled: Em.computed.gte('model.length', 3),
userFieldsDescription: function() {
return I18n.t('admin.user_fields.description');
}.property(),
userFieldsName: function() {
return I18n.t('admin.user_fields.name');
}.property(),