Complete custom field management
Dieser Commit ist enthalten in:
Ursprung
9e0cf29b7c
Commit
b14d334829
22 geänderte Dateien mit 300 neuen und 79 gelöschten Zeilen
45
assets/javascripts/discourse/components/custom-field-input.js.es6
Normale Datei
45
assets/javascripts/discourse/components/custom-field-input.js.es6
Normale Datei
|
@ -0,0 +1,45 @@
|
||||||
|
import Component from "@ember/component";
|
||||||
|
import discourseComputed, { discourseObserve } from "discourse-common/utils/decorators";
|
||||||
|
import { or } from "@ember/object/computed";
|
||||||
|
|
||||||
|
const generateContent = function(array, type) {
|
||||||
|
return array.map(key => ({
|
||||||
|
id: key,
|
||||||
|
name: I18n.t(`admin.wizard.custom_field.${type}.${key}`)
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Component.extend({
|
||||||
|
tagName: 'tr',
|
||||||
|
topicSerializers: ['topic_view', 'topic_list_item'],
|
||||||
|
postSerializers: ['post'],
|
||||||
|
categorySerializers: ['basic_category', 'topic_view', 'topic_list_item'],
|
||||||
|
klassContent: generateContent(['topic', 'post', 'group', 'category'], 'klass'),
|
||||||
|
typeContent: generateContent(['string', 'boolean', 'json'], 'type'),
|
||||||
|
showInputs: or('field.new', 'field.edit'),
|
||||||
|
|
||||||
|
@discourseComputed('field.klass')
|
||||||
|
serializerContent(klass) {
|
||||||
|
const serializers = this.get(`${klass}Serializers`);
|
||||||
|
|
||||||
|
if (serializers) {
|
||||||
|
return generateContent(serializers, 'serializers');
|
||||||
|
} else {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
actions: {
|
||||||
|
edit() {
|
||||||
|
this.set('field.edit', true);
|
||||||
|
},
|
||||||
|
|
||||||
|
close() {
|
||||||
|
if (this.field.edit) {
|
||||||
|
this.set('field.edit', false);
|
||||||
|
} else {
|
||||||
|
this.removeField(this.field);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
|
@ -21,9 +21,11 @@ export default Component.extend({
|
||||||
showGroup: computed('activeType', function() { return this.showInput('group') }),
|
showGroup: computed('activeType', function() { return this.showInput('group') }),
|
||||||
showUser: computed('activeType', function() { return this.showInput('user') }),
|
showUser: computed('activeType', function() { return this.showInput('user') }),
|
||||||
showList: computed('activeType', function() { return this.showInput('list') }),
|
showList: computed('activeType', function() { return this.showInput('list') }),
|
||||||
|
showCustomField: computed('activeType', function() { return this.showInput('customField') }),
|
||||||
textEnabled: computed('options.textSelection', 'inputType', function() { return this.optionEnabled('textSelection') }),
|
textEnabled: computed('options.textSelection', 'inputType', function() { return this.optionEnabled('textSelection') }),
|
||||||
wizardFieldEnabled: computed('options.wizardFieldSelection', 'inputType', function() { return this.optionEnabled('wizardFieldSelection') }),
|
wizardFieldEnabled: computed('options.wizardFieldSelection', 'inputType', function() { return this.optionEnabled('wizardFieldSelection') }),
|
||||||
wizardActionEnabled: computed('options.wizardActionSelection', 'inputType', function() { return this.optionEnabled('wizardActionSelection') }),
|
wizardActionEnabled: computed('options.wizardActionSelection', 'inputType', function() { return this.optionEnabled('wizardActionSelection') }),
|
||||||
|
customFieldEnabled: computed('options.customFieldSelection', 'inputType', function() { return this.optionEnabled('customFieldSelection') }),
|
||||||
userFieldEnabled: computed('options.userFieldSelection', 'inputType', function() { return this.optionEnabled('userFieldSelection') }),
|
userFieldEnabled: computed('options.userFieldSelection', 'inputType', function() { return this.optionEnabled('userFieldSelection') }),
|
||||||
userFieldOptionsEnabled: computed('options.userFieldOptionsSelection', 'inputType', function() { return this.optionEnabled('userFieldOptionsSelection') }),
|
userFieldOptionsEnabled: computed('options.userFieldOptionsSelection', 'inputType', function() { return this.optionEnabled('userFieldOptionsSelection') }),
|
||||||
categoryEnabled: computed('options.categorySelection', 'inputType', function() { return this.optionEnabled('categorySelection') }),
|
categoryEnabled: computed('options.categorySelection', 'inputType', function() { return this.optionEnabled('categorySelection') }),
|
||||||
|
@ -34,7 +36,7 @@ export default Component.extend({
|
||||||
|
|
||||||
groups: alias('site.groups'),
|
groups: alias('site.groups'),
|
||||||
categories: alias('site.categories'),
|
categories: alias('site.categories'),
|
||||||
showComboBox: or('showWizardField', 'showWizardAction', 'showUserField', 'showUserFieldOptions'),
|
showComboBox: or('showWizardField', 'showWizardAction', 'showUserField', 'showUserFieldOptions', 'showCustomField'),
|
||||||
showMultiSelect: or('showCategory', 'showGroup'),
|
showMultiSelect: or('showCategory', 'showGroup'),
|
||||||
hasTypes: gt('selectorTypes.length', 1),
|
hasTypes: gt('selectorTypes.length', 1),
|
||||||
showTypes: false,
|
showTypes: false,
|
||||||
|
@ -88,7 +90,8 @@ export default Component.extend({
|
||||||
'showController.wizard.actions.[]',
|
'showController.wizard.actions.[]',
|
||||||
'showController.userFields.[]',
|
'showController.userFields.[]',
|
||||||
'showController.currentField.id',
|
'showController.currentField.id',
|
||||||
'showController.currentAction.id'
|
'showController.currentAction.id',
|
||||||
|
'showController.customFields'
|
||||||
)
|
)
|
||||||
comboBoxContent(
|
comboBoxContent(
|
||||||
activeType,
|
activeType,
|
||||||
|
@ -96,7 +99,8 @@ export default Component.extend({
|
||||||
wizardActions,
|
wizardActions,
|
||||||
userFields,
|
userFields,
|
||||||
currentFieldId,
|
currentFieldId,
|
||||||
currentActionId
|
currentActionId,
|
||||||
|
customFields
|
||||||
) {
|
) {
|
||||||
let content;
|
let content;
|
||||||
|
|
||||||
|
@ -139,6 +143,10 @@ export default Component.extend({
|
||||||
content = userFields;
|
content = userFields;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (activeType === 'customField') {
|
||||||
|
content = customFields;
|
||||||
|
}
|
||||||
|
|
||||||
return content;
|
return content;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,7 @@ import { ajax } from 'discourse/lib/ajax';
|
||||||
import { popupAjaxError } from 'discourse/lib/ajax-error';
|
import { popupAjaxError } from 'discourse/lib/ajax-error';
|
||||||
|
|
||||||
export default Controller.extend({
|
export default Controller.extend({
|
||||||
fieldKeys: ['klass', 'name', 'type'],
|
fieldKeys: ['klass', 'type', 'serializers', 'name'],
|
||||||
classes: ['topic', 'user', 'group'],
|
|
||||||
|
|
||||||
actions: {
|
actions: {
|
||||||
addField() {
|
addField() {
|
||||||
|
@ -16,13 +15,28 @@ export default Controller.extend({
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
removeField(field) {
|
||||||
|
this.get('customFields').removeObject(field);
|
||||||
|
},
|
||||||
|
|
||||||
saveFields() {
|
saveFields() {
|
||||||
|
this.set('saving', true);
|
||||||
ajax(`/admin/wizards/custom-fields`, {
|
ajax(`/admin/wizards/custom-fields`, {
|
||||||
type: 'PUT',
|
type: 'PUT',
|
||||||
data: {
|
dataType: 'json',
|
||||||
|
contentType: 'application/json',
|
||||||
|
data: JSON.stringify({
|
||||||
custom_fields: this.customFields
|
custom_fields: this.customFields
|
||||||
|
})
|
||||||
|
}).then(result => {
|
||||||
|
if (result.success) {
|
||||||
|
this.set('saveIcon', 'check');
|
||||||
|
} else {
|
||||||
|
this.set('saveIcon', 'times');
|
||||||
}
|
}
|
||||||
}).catch(popupAjaxError)
|
setTimeout(() => this.set('saveIcon', ''), 5000);
|
||||||
|
}).finally(() => this.set('saving', false))
|
||||||
|
.catch(popupAjaxError);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
|
@ -86,7 +86,8 @@ const selectionTypes = [
|
||||||
'group',
|
'group',
|
||||||
'category',
|
'category',
|
||||||
'tag',
|
'tag',
|
||||||
'user'
|
'user',
|
||||||
|
'customField'
|
||||||
]
|
]
|
||||||
|
|
||||||
function defaultSelectionType(inputType, options = {}) {
|
function defaultSelectionType(inputType, options = {}) {
|
||||||
|
|
|
@ -2,6 +2,7 @@ import CustomWizard from '../models/custom-wizard';
|
||||||
import { ajax } from 'discourse/lib/ajax';
|
import { ajax } from 'discourse/lib/ajax';
|
||||||
import DiscourseRoute from "discourse/routes/discourse";
|
import DiscourseRoute from "discourse/routes/discourse";
|
||||||
import I18n from "I18n";
|
import I18n from "I18n";
|
||||||
|
import { selectKitContent } from '../lib/wizard';
|
||||||
|
|
||||||
export default DiscourseRoute.extend({
|
export default DiscourseRoute.extend({
|
||||||
model(params) {
|
model(params) {
|
||||||
|
@ -32,6 +33,7 @@ export default DiscourseRoute.extend({
|
||||||
wizardList: parentModel.wizard_list,
|
wizardList: parentModel.wizard_list,
|
||||||
fieldTypes,
|
fieldTypes,
|
||||||
userFields: parentModel.userFields,
|
userFields: parentModel.userFields,
|
||||||
|
customFields: selectKitContent(parentModel.custom_fields.map(f => f.name)),
|
||||||
apis: parentModel.apis,
|
apis: parentModel.apis,
|
||||||
themes: parentModel.themes,
|
themes: parentModel.themes,
|
||||||
wizard,
|
wizard,
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import DiscourseRoute from "discourse/routes/discourse";
|
import DiscourseRoute from "discourse/routes/discourse";
|
||||||
import { buildFieldTypes } from '../lib/wizard-schema';
|
import { buildFieldTypes } from '../lib/wizard-schema';
|
||||||
import { set } from "@ember/object";
|
import EmberObject, { set } from "@ember/object";
|
||||||
|
import { A } from "@ember/array";
|
||||||
import { all } from "rsvp";
|
import { all } from "rsvp";
|
||||||
import { ajax } from 'discourse/lib/ajax';
|
import { ajax } from 'discourse/lib/ajax';
|
||||||
|
|
||||||
|
@ -62,7 +63,8 @@ export default DiscourseRoute.extend({
|
||||||
setupController(controller, model) {
|
setupController(controller, model) {
|
||||||
controller.setProperties({
|
controller.setProperties({
|
||||||
wizardList: model.wizard_list,
|
wizardList: model.wizard_list,
|
||||||
wizardId: this.currentWizard()
|
wizardId: this.currentWizard(),
|
||||||
|
custom_fields: A(model.custom_fields.map(f => EmberObject.create(f)))
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -1,32 +1,37 @@
|
||||||
<div class="admin-wizard-controls">
|
<div class="admin-wizard-controls">
|
||||||
<h3>{{i18n 'admin.wizard.custom_fields.nav_label'}}</h3>
|
<h3>{{i18n 'admin.wizard.custom_field.nav_label'}}</h3>
|
||||||
|
|
||||||
|
<div class="buttons">
|
||||||
|
{{#if saving}}
|
||||||
|
{{loading-spinner size="small"}}
|
||||||
|
{{else}}
|
||||||
|
{{#if saveIcon}}
|
||||||
|
{{d-icon saveIcon}}
|
||||||
|
{{/if}}
|
||||||
|
{{/if}}
|
||||||
{{d-button
|
{{d-button
|
||||||
label="add"
|
label="admin.wizard.custom_field.save"
|
||||||
|
action="saveFields"}}
|
||||||
|
{{d-button
|
||||||
|
label="admin.wizard.custom_field.add"
|
||||||
icon="plus"
|
icon="plus"
|
||||||
action="addField"}}
|
action="addField"}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="admin-wizard-container">
|
<div class="admin-wizard-container">
|
||||||
{{#if model}}
|
{{#if customFields}}
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
{{#each fieldKeys as |key|}}
|
{{#each fieldKeys as |key|}}
|
||||||
<th>{{i18n (concat "admin.wizard.custom_fields." key)}}</th>
|
<th>{{i18n (concat "admin.wizard.custom_field." key ".label")}}</th>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
|
<th></th>
|
||||||
</tr>
|
</tr>
|
||||||
{{#each customFields as |field|}}
|
{{#each customFields as |field|}}
|
||||||
<tr>
|
{{custom-field-input
|
||||||
{{#if field.new}}
|
field=field
|
||||||
<td>{{combo-box value=field.klass content=classes onChange=(action (mut field.klass))}}</td>
|
removeField=(action 'removeField')}}
|
||||||
<td>{{input value=field.name}}</td>
|
|
||||||
<td>{{combo-box value=field.type content=types onChange=(action (mut field.type))}}</td>
|
|
||||||
{{else}}
|
|
||||||
{{#each-in field as |k v|}}
|
|
||||||
<td>{{v}}</td>
|
|
||||||
{{/each-in}}
|
|
||||||
{{/if}}
|
|
||||||
</tr>
|
|
||||||
{{/each}}
|
{{/each}}
|
||||||
</table>
|
</table>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{{#admin-nav}}
|
{{#admin-nav}}
|
||||||
{{nav-item route='adminWizardsWizard' label='admin.wizard.nav_label'}}
|
{{nav-item route='adminWizardsWizard' label='admin.wizard.nav_label'}}
|
||||||
{{nav-item route='adminWizardsCustomFields' label='admin.wizard.custom_fields.nav_label'}}
|
{{nav-item route='adminWizardsCustomFields' label='admin.wizard.custom_field.nav_label'}}
|
||||||
{{nav-item route='adminWizardsSubmissions' label='admin.wizard.submissions.nav_label'}}
|
{{nav-item route='adminWizardsSubmissions' label='admin.wizard.submissions.nav_label'}}
|
||||||
{{#if siteSettings.wizard_apis_enabled}}
|
{{#if siteSettings.wizard_apis_enabled}}
|
||||||
{{nav-item route='adminWizardsApi' label='admin.wizard.api.nav_label'}}
|
{{nav-item route='adminWizardsApi' label='admin.wizard.api.nav_label'}}
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
{{#if showInputs}}
|
||||||
|
<td>
|
||||||
|
{{combo-box
|
||||||
|
value=field.klass
|
||||||
|
content=klassContent
|
||||||
|
none="admin.wizard.custom_field.klass.select"
|
||||||
|
onChange=(action (mut field.klass))}}
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
{{combo-box
|
||||||
|
value=field.type
|
||||||
|
content=typeContent
|
||||||
|
none="admin.wizard.custom_field.type.select"
|
||||||
|
onChange=(action (mut field.type))}}
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
{{multi-select
|
||||||
|
value=field.serializers
|
||||||
|
content=serializerContent
|
||||||
|
none="admin.wizard.custom_field.serializers.select"
|
||||||
|
onChange=(action (mut field.serializers))}}
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
{{input
|
||||||
|
value=field.name
|
||||||
|
placeholder=(i18n "admin.wizard.custom_field.klass.select")}}
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
{{d-button action="close" icon="times"}}
|
||||||
|
</td>
|
||||||
|
{{else}}
|
||||||
|
<td><label>{{field.klass}}</label></td>
|
||||||
|
<td><label>{{field.type}}</label></td>
|
||||||
|
<td>
|
||||||
|
{{#each field.serializers as |serializer|}}
|
||||||
|
<label>{{serializer}}</label>
|
||||||
|
{{/each}}
|
||||||
|
</td>
|
||||||
|
<td><label>{{field.name}}</label></td>
|
||||||
|
<td>
|
||||||
|
{{d-button action="edit" icon="pencil-alt"}}
|
||||||
|
{{d-button action="close" icon="times"}}
|
||||||
|
</td>
|
||||||
|
{{/if}}
|
|
@ -730,6 +730,7 @@
|
||||||
onUpdate=(action 'mappedFieldUpdated')
|
onUpdate=(action 'mappedFieldUpdated')
|
||||||
options=(hash
|
options=(hash
|
||||||
inputTypes='association'
|
inputTypes='association'
|
||||||
|
customFieldSelection='key'
|
||||||
wizardFieldSelection='value'
|
wizardFieldSelection='value'
|
||||||
wizardActionSelection='value'
|
wizardActionSelection='value'
|
||||||
userFieldSelection='value'
|
userFieldSelection='value'
|
||||||
|
|
|
@ -535,3 +535,21 @@
|
||||||
background-color: $secondary;
|
background-color: $secondary;
|
||||||
border: 1px solid $primary-medium;
|
border: 1px solid $primary-medium;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.admin-wizards-custom-fields {
|
||||||
|
.select-kit {
|
||||||
|
width: 200px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.select-kit.multi-select {
|
||||||
|
width: 250px;
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type="text"] {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
td:last-of-type {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -102,6 +102,7 @@ en:
|
||||||
tag: "tag"
|
tag: "tag"
|
||||||
group: "group"
|
group: "group"
|
||||||
list: "list"
|
list: "list"
|
||||||
|
custom_field: "custom field"
|
||||||
|
|
||||||
placeholder:
|
placeholder:
|
||||||
text: "Enter text"
|
text: "Enter text"
|
||||||
|
@ -115,6 +116,7 @@ en:
|
||||||
tag: "Select tag"
|
tag: "Select tag"
|
||||||
group: "Select group"
|
group: "Select group"
|
||||||
list: "Enter item"
|
list: "Enter item"
|
||||||
|
custom_field: "Select field"
|
||||||
|
|
||||||
error:
|
error:
|
||||||
failed: "failed to save wizard"
|
failed: "failed to save wizard"
|
||||||
|
@ -277,11 +279,30 @@ en:
|
||||||
visibility_level: Visibility Level
|
visibility_level: Visibility Level
|
||||||
members_visibility_level: Members Visibility Level
|
members_visibility_level: Members Visibility Level
|
||||||
|
|
||||||
custom_fields:
|
custom_field:
|
||||||
nav_label: "Custom Fields"
|
nav_label: "Custom Fields"
|
||||||
klass: "Class"
|
add: "Add Custom Field"
|
||||||
name: "Name"
|
save: "Save Custom Fields"
|
||||||
type: "Type"
|
name:
|
||||||
|
label: "Name"
|
||||||
|
select: "Enter a name"
|
||||||
|
type:
|
||||||
|
label: "Type"
|
||||||
|
select: "Select a type"
|
||||||
|
string: "String"
|
||||||
|
boolean: "Boolean"
|
||||||
|
json: "JSON"
|
||||||
|
klass:
|
||||||
|
label: "Class"
|
||||||
|
select: "Select a class"
|
||||||
|
topic: "Topic"
|
||||||
|
group: "Group"
|
||||||
|
user: "User"
|
||||||
|
serializers:
|
||||||
|
label: "Serializers"
|
||||||
|
select: "Select serializers"
|
||||||
|
topic_view: "Topic View"
|
||||||
|
topic_list_item: "Topic List Item"
|
||||||
|
|
||||||
submissions:
|
submissions:
|
||||||
nav_label: "Submissions"
|
nav_label: "Submissions"
|
||||||
|
|
|
@ -19,6 +19,9 @@ Discourse::Application.routes.append do
|
||||||
put 'admin/wizards/wizard/:wizard_id' => 'admin_wizard#save'
|
put 'admin/wizards/wizard/:wizard_id' => 'admin_wizard#save'
|
||||||
delete 'admin/wizards/wizard/:wizard_id' => 'admin_wizard#remove'
|
delete 'admin/wizards/wizard/:wizard_id' => 'admin_wizard#remove'
|
||||||
|
|
||||||
|
get 'admin/wizards/custom-fields' => 'admin_custom_fields#index'
|
||||||
|
put 'admin/wizards/custom-fields' => 'admin_custom_fields#update'
|
||||||
|
|
||||||
get 'admin/wizards/submissions' => 'admin_submissions#index'
|
get 'admin/wizards/submissions' => 'admin_submissions#index'
|
||||||
get 'admin/wizards/submissions/:wizard_id' => 'admin_submissions#show'
|
get 'admin/wizards/submissions/:wizard_id' => 'admin_submissions#show'
|
||||||
get 'admin/wizards/submissions/:wizard_id/download' => 'admin_submissions#download'
|
get 'admin/wizards/submissions/:wizard_id/download' => 'admin_submissions#download'
|
||||||
|
|
|
@ -10,4 +10,8 @@ class CustomWizard::AdminController < ::Admin::AdminController
|
||||||
params.require(:wizard_id)
|
params.require(:wizard_id)
|
||||||
@wizard = CustomWizard::Wizard.create(params[:wizard_id].underscore)
|
@wizard = CustomWizard::Wizard.create(params[:wizard_id].underscore)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def custom_field_list
|
||||||
|
serialize_data(CustomWizard::CustomField.list, CustomWizard::CustomFieldSerializer)
|
||||||
|
end
|
||||||
end
|
end
|
|
@ -1,18 +1,19 @@
|
||||||
class CustomWizard::CustomFieldsController < CustomWizard::AdminController
|
class CustomWizard::AdminCustomFieldsController < CustomWizard::AdminController
|
||||||
def index
|
def index
|
||||||
render_custom_field_list
|
render_json_dump(custom_field_list)
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
field_data = params[:custom_fields]
|
custom_fields = custom_field_params[:custom_fields].map do |data|
|
||||||
|
CustomWizard::CustomField.new(data.to_h)
|
||||||
|
end
|
||||||
|
|
||||||
custom_fields = field_data.map { |data| CustomWizard::CustomFields.new(data) }
|
custom_fields.each do |custom_field|
|
||||||
|
|
||||||
custom_fields.each do |field_data|
|
|
||||||
custom_field.validate
|
custom_field.validate
|
||||||
|
|
||||||
unless custom_field.valid?
|
unless custom_field.valid?
|
||||||
raise Discourse::InvalidParameters, "Invalid field: '#{custom_field.name}'"
|
raise Discourse::InvalidParameters,
|
||||||
|
custom_field.errors.full_messages.join("\n\n")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -25,16 +26,22 @@ class CustomWizard::CustomFieldsController < CustomWizard::AdminController
|
||||||
end
|
end
|
||||||
|
|
||||||
if all_fields_saved
|
if all_fields_saved
|
||||||
render_custom_field_list
|
render json: success_json
|
||||||
else
|
else
|
||||||
render json: error_json
|
render json: error_json
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_custom_field_list
|
private
|
||||||
render_serialized(
|
|
||||||
CustomWizard::CustomFields.list,
|
def custom_field_params
|
||||||
CustomWizard::CustomFieldsSerializer
|
params.permit(
|
||||||
|
custom_fields: [
|
||||||
|
:klass,
|
||||||
|
:name,
|
||||||
|
:type,
|
||||||
|
serializers: []
|
||||||
|
]
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
|
@ -7,7 +7,8 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
|
||||||
CustomWizard::Wizard.list,
|
CustomWizard::Wizard.list,
|
||||||
each_serializer: CustomWizard::BasicWizardSerializer
|
each_serializer: CustomWizard::BasicWizardSerializer
|
||||||
),
|
),
|
||||||
field_types: CustomWizard::Field.types
|
field_types: CustomWizard::Field.types,
|
||||||
|
custom_fields: custom_field_list
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -60,13 +60,19 @@ class CustomWizard::Action
|
||||||
end
|
end
|
||||||
|
|
||||||
def send_message
|
def send_message
|
||||||
if action['required'].present? && data[action['required']].blank?
|
|
||||||
log_error(
|
if action['required'].present?
|
||||||
"required not present",
|
required = CustomWizard::Mapper.new(
|
||||||
"required: #{action['required']}; data: #{data[action['required']]}"
|
inputs: action['required'],
|
||||||
)
|
data: data,
|
||||||
|
user: user
|
||||||
|
).perform
|
||||||
|
|
||||||
|
if required.blank?
|
||||||
|
log_error("required input not present")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
params = basic_topic_params
|
params = basic_topic_params
|
||||||
|
|
||||||
|
@ -410,17 +416,32 @@ class CustomWizard::Action
|
||||||
user: user
|
user: user
|
||||||
).perform
|
).perform
|
||||||
|
|
||||||
|
registered_fields = CustomWizard::CustomField.list
|
||||||
|
|
||||||
field_map.each do |field|
|
field_map.each do |field|
|
||||||
keyArr = field[:key].split('.')
|
keyArr = field[:key].split('.')
|
||||||
value = field[:value]
|
value = field[:value]
|
||||||
|
|
||||||
if keyArr.first === 'topic'
|
if keyArr.length > 1
|
||||||
|
klass = keyArr.first
|
||||||
|
name = keyArr.last
|
||||||
|
else
|
||||||
|
name = keyArr.first
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
registered = registered_fields.select { |f| f.name == name }
|
||||||
|
if registered.first.present?
|
||||||
|
klass = registered.first.klass
|
||||||
|
end
|
||||||
|
|
||||||
|
if klass === 'topic'
|
||||||
params[:topic_opts] ||= {}
|
params[:topic_opts] ||= {}
|
||||||
params[:topic_opts][:custom_fields] ||= {}
|
params[:topic_opts][:custom_fields] ||= {}
|
||||||
params[:topic_opts][:custom_fields][keyArr.last] = value
|
params[:topic_opts][:custom_fields][name] = value
|
||||||
else
|
else
|
||||||
params[:custom_fields] ||= {}
|
params[:custom_fields] ||= {}
|
||||||
params[:custom_fields][keyArr.last.to_sym] = value
|
params[:custom_fields][name] = value
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
class ::CustomWizard::CustomFields
|
class ::CustomWizard::CustomField
|
||||||
include HasErrors
|
include HasErrors
|
||||||
include ActiveModel::Serialization
|
include ActiveModel::Serialization
|
||||||
|
|
||||||
CLASSES ||= ["topic", "user", "group", "category"]
|
CLASSES ||= ["topic", "group", "category", "post"]
|
||||||
ATTRS ||= ["name", "klass", "type"]
|
SERIALIZERS ||= ["topic_view", "topic_list_item", "post", "basic_category"]
|
||||||
|
TYPES ||= ["string", "boolean", "json"]
|
||||||
|
ATTRS ||= ["name", "klass", "type", "serializers"]
|
||||||
KEY ||= "custom_wizard_custom_fields"
|
KEY ||= "custom_wizard_custom_fields"
|
||||||
|
|
||||||
def initialize(data)
|
def initialize(data)
|
||||||
|
@ -26,7 +28,7 @@ class ::CustomWizard::CustomFields
|
||||||
value = send(attr)
|
value = send(attr)
|
||||||
|
|
||||||
if attr == 'name'
|
if attr == 'name'
|
||||||
name = value
|
name = value.parameterize(separator: '_')
|
||||||
else
|
else
|
||||||
data[attr] = value
|
data[attr] = value
|
||||||
end
|
end
|
||||||
|
@ -41,8 +43,27 @@ class ::CustomWizard::CustomFields
|
||||||
def validate
|
def validate
|
||||||
ATTRS.each do |attr|
|
ATTRS.each do |attr|
|
||||||
value = send(attr)
|
value = send(attr)
|
||||||
add_error("Attribute required: #{attr}") if value.blank?
|
|
||||||
add_error("Unsupported class: #{value}") if CLASSES.exclude?(value)
|
if value.blank?
|
||||||
|
add_error("Attribute required: #{attr}")
|
||||||
|
next
|
||||||
|
end
|
||||||
|
|
||||||
|
if attr == 'klass' && CLASSES.exclude?(value)
|
||||||
|
add_error("Unsupported class: #{value}")
|
||||||
|
end
|
||||||
|
|
||||||
|
if attr == 'serializers' && (SERIALIZERS & value).empty?
|
||||||
|
add_error("Unsupported serializer: #{value}")
|
||||||
|
end
|
||||||
|
|
||||||
|
if attr == 'type' && TYPES.exclude?(value)
|
||||||
|
add_error("Unsupported type: #{value}")
|
||||||
|
end
|
||||||
|
|
||||||
|
if attr == 'name' && value.length < 3
|
||||||
|
add_error("Field name is too short")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -320,10 +320,6 @@ class CustomWizard::Wizard
|
||||||
Jobs.cancel_scheduled_job(:set_after_time_wizard, wizard_id: wizard[:id])
|
Jobs.cancel_scheduled_job(:set_after_time_wizard, wizard_id: wizard[:id])
|
||||||
Jobs.enqueue(:clear_after_time_wizard, wizard_id: wizard[:id])
|
Jobs.enqueue(:clear_after_time_wizard, wizard_id: wizard[:id])
|
||||||
end
|
end
|
||||||
|
|
||||||
if serialize_fields.present?
|
|
||||||
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
wizard[:id]
|
wizard[:id]
|
||||||
|
|
17
plugin.rb
17
plugin.rb
|
@ -52,7 +52,7 @@ after_initialize do
|
||||||
../lib/custom_wizard/action_result.rb
|
../lib/custom_wizard/action_result.rb
|
||||||
../lib/custom_wizard/action.rb
|
../lib/custom_wizard/action.rb
|
||||||
../lib/custom_wizard/builder.rb
|
../lib/custom_wizard/builder.rb
|
||||||
../lib/custom_wizard/custom_fields.rb
|
../lib/custom_wizard/custom_field.rb
|
||||||
../lib/custom_wizard/field.rb
|
../lib/custom_wizard/field.rb
|
||||||
../lib/custom_wizard/mapper.rb
|
../lib/custom_wizard/mapper.rb
|
||||||
../lib/custom_wizard/log.rb
|
../lib/custom_wizard/log.rb
|
||||||
|
@ -70,7 +70,7 @@ after_initialize do
|
||||||
../serializers/custom_wizard/api_serializer.rb
|
../serializers/custom_wizard/api_serializer.rb
|
||||||
../serializers/custom_wizard/basic_api_serializer.rb
|
../serializers/custom_wizard/basic_api_serializer.rb
|
||||||
../serializers/custom_wizard/basic_wizard_serializer.rb
|
../serializers/custom_wizard/basic_wizard_serializer.rb
|
||||||
../serializers/custom_wizard/custom_fields_serializer.rb
|
../serializers/custom_wizard/custom_field_serializer.rb
|
||||||
../serializers/custom_wizard/wizard_field_serializer.rb
|
../serializers/custom_wizard/wizard_field_serializer.rb
|
||||||
../serializers/custom_wizard/wizard_step_serializer.rb
|
../serializers/custom_wizard/wizard_step_serializer.rb
|
||||||
../serializers/custom_wizard/wizard_serializer.rb
|
../serializers/custom_wizard/wizard_serializer.rb
|
||||||
|
@ -163,19 +163,26 @@ after_initialize do
|
||||||
|
|
||||||
CustomWizard::Wizard.register_styles
|
CustomWizard::Wizard.register_styles
|
||||||
|
|
||||||
CustomWizard::CustomFields.list.each do |field|
|
CustomWizard::CustomField.list.each do |field|
|
||||||
|
self.send("register_#{field.klass}_custom_field_type", field.name, field.type.to_sym)
|
||||||
|
|
||||||
add_to_class(field.klass.to_sym, field.name.to_sym) do
|
add_to_class(field.klass.to_sym, field.name.to_sym) do
|
||||||
custom_fields[field.name]
|
custom_fields[field.name]
|
||||||
end
|
end
|
||||||
|
|
||||||
add_to_serializer(field.klass.to_sym, field.name.to_sym) do
|
if field.serializers.any?
|
||||||
if field.klass === 'topic'
|
field.serializers.each do |klass|
|
||||||
|
klass = klass.to_sym
|
||||||
|
add_to_serializer(klass, field.name.to_sym) do
|
||||||
|
if klass == :topic_view
|
||||||
object.topic.send(field.name)
|
object.topic.send(field.name)
|
||||||
else
|
else
|
||||||
object.send(field.name)
|
object.send(field.name)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
DiscourseEvent.trigger(:custom_wizard_ready)
|
DiscourseEvent.trigger(:custom_wizard_ready)
|
||||||
end
|
end
|
||||||
|
|
3
serializers/custom_wizard/custom_field_serializer.rb
Normale Datei
3
serializers/custom_wizard/custom_field_serializer.rb
Normale Datei
|
@ -0,0 +1,3 @@
|
||||||
|
class CustomWizard::CustomFieldSerializer < ApplicationSerializer
|
||||||
|
attributes :klass, :name, :type, :serializers
|
||||||
|
end
|
|
@ -1,3 +0,0 @@
|
||||||
class CustomWizard::CustomFieldsSerializer < ApplicationSerializer
|
|
||||||
attributes :klass, :name, :type
|
|
||||||
end
|
|
Laden …
In neuem Issue referenzieren