{{i18n 'admin.user_fields.help'}}
{{#if model}} - {{#each model as |uf|}} - {{admin-user-field-item userField=uf fieldTypes=fieldTypes destroyAction="destroy"}} + {{#each arrangedContent as |uf|}} + {{admin-user-field-item userField=uf + fieldTypes=fieldTypes + firstField=arrangedContent.firstObject + lastField=arrangedContent.lastObject + destroyAction="destroy" + moveUpAction="moveUp" + moveDownAction="moveDown"}} {{/each}} {{/if}} diff --git a/app/assets/javascripts/discourse/adapters/rest.js.es6 b/app/assets/javascripts/discourse/adapters/rest.js.es6 index ec25f2d13..5a64730ab 100644 --- a/app/assets/javascripts/discourse/adapters/rest.js.es6 +++ b/app/assets/javascripts/discourse/adapters/rest.js.es6 @@ -17,10 +17,14 @@ function rethrow(error) { } export default Ember.Object.extend({ - pathFor(store, type, findArgs) { - let path = "/" + Ember.String.underscore(store.pluralize(type)); - if (ADMIN_MODELS.indexOf(type) !== -1) { path = "/admin" + path; } + basePath(store, type) { + if (ADMIN_MODELS.indexOf(type) !== -1) { return "/admin/"; } + return "/"; + }, + + pathFor(store, type, findArgs) { + let path = this.basePath(store, type, findArgs) + Ember.String.underscore(store.pluralize(type)); if (findArgs) { if (typeof findArgs === "object") { @@ -51,9 +55,10 @@ export default Ember.Object.extend({ update(store, type, id, attrs) { const data = {}; - data[Ember.String.underscore(type)] = attrs; + const typeField = Ember.String.underscore(type); + data[typeField] = attrs; return ajax(this.pathFor(store, type, id), { method: 'PUT', data }).then(function(json) { - return new Result(json[type], json); + return new Result(json[typeField], json); }); }, diff --git a/app/assets/javascripts/discourse/adapters/user-field.js.es6 b/app/assets/javascripts/discourse/adapters/user-field.js.es6 new file mode 100644 index 000000000..f57240a11 --- /dev/null +++ b/app/assets/javascripts/discourse/adapters/user-field.js.es6 @@ -0,0 +1,7 @@ +import RestAdapter from 'discourse/adapters/rest'; + +export default RestAdapter.extend({ + basePath() { + return "/admin/customize/"; + } +}); diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6 index b5812eb6a..a668d4cc8 100644 --- a/app/assets/javascripts/discourse/controllers/create-account.js.es6 +++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6 @@ -394,11 +394,8 @@ export default DiscourseController.extend(ModalFunctionality, { let userFields = this.site.get('user_fields'); if (userFields) { - userFields = userFields.map(function(f) { - return Ember.Object.create({ - value: null, - field: f - }); + userFields = _.sortBy(userFields, 'position').map(function(f) { + return Ember.Object.create({ value: null, field: f }); }); } this.set('userFields', userFields); diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6 index 843e22eb1..6396f8e54 100644 --- a/app/assets/javascripts/discourse/models/rest.js.es6 +++ b/app/assets/javascripts/discourse/models/rest.js.es6 @@ -18,7 +18,6 @@ const RestModel = Ember.Object.extend(Presence, { const self = this; self.set('isSaving', true); return store.update(type, this.get('id'), props).then(function(res) { - const payload = self.__munge(res.payload || res.responseJson); if (payload.success === "OK") { diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index d9a06c315..166829bb1 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -1460,7 +1460,6 @@ tr.not-activated { .controls { float: right; text-align: right; - width: 20%; } .clearfix { diff --git a/app/controllers/admin/user_fields_controller.rb b/app/controllers/admin/user_fields_controller.rb index 6770d67bd..0980381ec 100644 --- a/app/controllers/admin/user_fields_controller.rb +++ b/app/controllers/admin/user_fields_controller.rb @@ -1,11 +1,13 @@ class Admin::UserFieldsController < Admin::AdminController def self.columns - [:name, :field_type, :editable, :description, :required, :show_on_profile] + [:name, :field_type, :editable, :description, :required, :show_on_profile, :position] end def create field = UserField.new(params.require(:user_field).permit(*Admin::UserFieldsController.columns)) + + field.position = (UserField.maximum(:position) || 0) + 1 field.required = params[:required] == "true" fetch_options(field) @@ -15,33 +17,35 @@ class Admin::UserFieldsController < Admin::AdminController end def index - user_fields = UserField.all.includes(:user_field_options) + user_fields = UserField.all.includes(:user_field_options).order(:position) render_serialized(user_fields, UserFieldSerializer, root: 'user_fields') end def update - field_params = params.require(:user_field) - + field_params = params[:user_field] field = UserField.where(id: params.require(:id)).first Admin::UserFieldsController.columns.each do |col| - field.send("#{col}=", field_params[col] || false) + unless field_params[col].nil? + field.send("#{col}=", field_params[col]) + end end UserFieldOption.where(user_field_id: field.id).delete_all fetch_options(field) - json_result(field, serializer: UserFieldSerializer) do - field.save + if field.save + render_serialized(field, UserFieldSerializer, root: 'user_field') + else + render_json_error(field) end end def destroy field = UserField.where(id: params.require(:id)).first field.destroy if field.present? - render nothing: true + render json: success_json end - protected def fetch_options(field) diff --git a/app/serializers/user_field_serializer.rb b/app/serializers/user_field_serializer.rb index 0c8f6f721..7c0689806 100644 --- a/app/serializers/user_field_serializer.rb +++ b/app/serializers/user_field_serializer.rb @@ -6,6 +6,7 @@ class UserFieldSerializer < ApplicationSerializer :editable, :required, :show_on_profile, + :position, :options def options diff --git a/db/migrate/20150730154830_add_position_to_user_fields.rb b/db/migrate/20150730154830_add_position_to_user_fields.rb new file mode 100644 index 000000000..0f0fd0499 --- /dev/null +++ b/db/migrate/20150730154830_add_position_to_user_fields.rb @@ -0,0 +1,6 @@ +class AddPositionToUserFields < ActiveRecord::Migration + def change + add_column :user_fields, :position, :integer, default: 0 + execute "UPDATE user_fields SET position = (SELECT COUNT(*) from user_fields as uf2 where uf2.id < user_fields.id)" + end +end diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index 60994d163..fe00b4838 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -249,6 +249,12 @@ export default function() { return response({ widget }); }); + this.put('/cool_things/:cool_thing_id', function(request) { + const cool_thing = parsePostData(request.requestBody).cool_thing; + return response({ cool_thing }); + }); + + this.get('/widgets', function(request) { let result = _widgets; diff --git a/test/javascripts/models/store-test.js.es6 b/test/javascripts/models/store-test.js.es6 index f0dca5ad7..bac22ecd5 100644 --- a/test/javascripts/models/store-test.js.es6 +++ b/test/javascripts/models/store-test.js.es6 @@ -70,6 +70,14 @@ test('update', function() { }); }); +test('update with a multi world name', function(assert) { + const store = createStore(); + return store.update('cool-thing', 123, {name: 'hello'}).then(function(result) { + assert.ok(result); + assert.equal(result.payload.name, 'hello'); + }); +}); + test('findAll', function() { const store = createStore(); return store.findAll('widget').then(function(result) { @@ -84,7 +92,7 @@ test('destroyRecord', function(assert) { const store = createStore(); return store.find('widget', 123).then(function(w) { store.destroyRecord('widget', w).then(function(result) { - ok(result); + assert.ok(result); }); }); });