Skip to content

Commit 01fe27d

Browse files
angusmcleodangusmcleod
committed
Remove subscription restrictions #1
1 parent 0710064 commit 01fe27d

26 files changed

+320
-869
lines changed

‎assets/javascripts/discourse/components/wizard-custom-field.hbs‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -264,51 +264,46 @@
264264
</div>
265265
{{/if}}
266266

267-
{{#wizard-subscription-container}}
268-
<div class="setting full field-mapper-setting">
269-
<div class="setting-label">
270-
<label>{{i18n "admin.wizard.condition"}}</label>
271-
</div>
267+
<div class="setting full field-mapper-setting">
268+
<div class="setting-label">
269+
<label>{{i18n "admin.wizard.condition"}}</label>
270+
</div>
272271

273-
<div class="setting-value">
274-
{{wizard-mapper
275-
inputs=this.field.condition
276-
options=this.fieldConditionOptions
277-
}}
278-
</div>
272+
<div class="setting-value">
273+
{{wizard-mapper
274+
inputs=this.field.condition
275+
options=this.fieldConditionOptions
276+
}}
279277
</div>
278+
</div>
280279

281-
<div class="setting full field-mapper-setting">
280+
<div class="setting full field-mapper-setting">
281+
<div class="setting-label">
282+
<label>{{i18n "admin.wizard.index"}}</label>
283+
</div>
284+
285+
<div class="setting-value">
286+
{{wizard-mapper inputs=this.field.index options=this.fieldIndexOptions}}
287+
</div>
288+
</div>
289+
290+
{{#if this.isCategory}}
291+
<div class="setting">
282292
<div class="setting-label">
283-
<label>{{i18n "admin.wizard.index"}}</label>
293+
<label>{{i18n "admin.wizard.field.property"}}</label>
284294
</div>
285295

286296
<div class="setting-value">
287-
{{wizard-mapper inputs=this.field.index options=this.fieldIndexOptions}}
297+
{{combo-box
298+
value=this.field.property
299+
content=this.categoryPropertyTypes
300+
onChange=(action (mut this.field.property))
301+
options=(hash none="admin.wizard.selector.placeholder.property")
302+
}}
288303
</div>
289304
</div>
305+
{{/if}}
290306

291-
{{#if this.isCategory}}
292-
<div class="setting">
293-
<div class="setting-label">
294-
<label>{{i18n "admin.wizard.field.property"}}</label>
295-
</div>
296-
297-
<div class="setting-value">
298-
{{combo-box
299-
value=this.field.property
300-
content=this.categoryPropertyTypes
301-
onChange=(action (mut this.field.property))
302-
options=(hash none="admin.wizard.selector.placeholder.property")
303-
}}
304-
</div>
305-
</div>
306-
{{/if}}
307-
308-
{{#if this.validations}}
309-
{{wizard-realtime-validations
310-
field=this.field
311-
validations=this.validations
312-
}}
313-
{{/if}}
314-
{{/wizard-subscription-container}}
307+
{{#if this.validations}}
308+
{{wizard-realtime-validations field=this.field validations=this.validations}}
309+
{{/if}}

‎assets/javascripts/discourse/components/wizard-custom-step.hbs‎

Lines changed: 57 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -32,75 +32,73 @@
3232
</div>
3333
</div>
3434

35-
{{#wizard-subscription-container}}
36-
<div class="setting full field-mapper-setting">
37-
<div class="setting-label">
38-
<label>{{i18n "admin.wizard.condition"}}</label>
39-
</div>
35+
<div class="setting full field-mapper-setting">
36+
<div class="setting-label">
37+
<label>{{i18n "admin.wizard.condition"}}</label>
38+
</div>
4039

41-
<div class="setting-value">
42-
{{wizard-mapper
43-
inputs=this.step.condition
44-
options=this.stepConditionOptions
45-
}}
46-
</div>
40+
<div class="setting-value">
41+
{{wizard-mapper
42+
inputs=this.step.condition
43+
options=this.stepConditionOptions
44+
}}
4745
</div>
46+
</div>
4847

49-
<div class="setting full">
50-
<div class="setting-label"></div>
51-
<div class="setting-value force-final">
52-
<h4>{{i18n "admin.wizard.step.force_final.label"}}</h4>
53-
<Input @type="checkbox" @checked={{this.step.force_final}} />
54-
<span>{{i18n "admin.wizard.step.force_final.description"}}</span>
55-
</div>
48+
<div class="setting full">
49+
<div class="setting-label"></div>
50+
<div class="setting-value force-final">
51+
<h4>{{i18n "admin.wizard.step.force_final.label"}}</h4>
52+
<Input @type="checkbox" @checked={{this.step.force_final}} />
53+
<span>{{i18n "admin.wizard.step.force_final.description"}}</span>
5654
</div>
55+
</div>
5756

58-
<div class="setting full field-mapper-setting">
59-
<div class="setting-label">
60-
<label>{{i18n "admin.wizard.step.required_data.label"}}</label>
61-
</div>
57+
<div class="setting full field-mapper-setting">
58+
<div class="setting-label">
59+
<label>{{i18n "admin.wizard.step.required_data.label"}}</label>
60+
</div>
6261

63-
<div class="setting-value">
64-
{{wizard-mapper
65-
inputs=this.step.required_data
66-
options=(hash
67-
inputTypes="validation"
68-
inputConnector="and"
69-
wizardFieldSelection="value"
70-
userFieldSelection="value"
71-
keyPlaceholder="admin.wizard.submission_key"
72-
context="step"
73-
)
74-
}}
75-
{{#if this.step.required_data}}
76-
<div class="required-data-message">
77-
<div class="label">
78-
{{i18n "admin.wizard.step.required_data.not_permitted_message"}}
79-
</div>
80-
<Input @value={{this.step.required_data_message}} />
62+
<div class="setting-value">
63+
{{wizard-mapper
64+
inputs=this.step.required_data
65+
options=(hash
66+
inputTypes="validation"
67+
inputConnector="and"
68+
wizardFieldSelection="value"
69+
userFieldSelection="value"
70+
keyPlaceholder="admin.wizard.submission_key"
71+
context="step"
72+
)
73+
}}
74+
{{#if this.step.required_data}}
75+
<div class="required-data-message">
76+
<div class="label">
77+
{{i18n "admin.wizard.step.required_data.not_permitted_message"}}
8178
</div>
82-
{{/if}}
83-
</div>
79+
<Input @value={{this.step.required_data_message}} />
80+
</div>
81+
{{/if}}
8482
</div>
83+
</div>
8584

86-
<div class="setting full field-mapper-setting">
87-
<div class="setting-label">
88-
<label>{{i18n "admin.wizard.step.permitted_params.label"}}</label>
89-
</div>
90-
<div class="setting-value">
91-
{{wizard-mapper
92-
inputs=this.step.permitted_params
93-
options=(hash
94-
pairConnector="set"
95-
inputTypes="association"
96-
keyPlaceholder="admin.wizard.param_key"
97-
valuePlaceholder="admin.wizard.submission_key"
98-
context="step"
99-
)
100-
}}
101-
</div>
85+
<div class="setting full field-mapper-setting">
86+
<div class="setting-label">
87+
<label>{{i18n "admin.wizard.step.permitted_params.label"}}</label>
10288
</div>
103-
{{/wizard-subscription-container}}
89+
<div class="setting-value">
90+
{{wizard-mapper
91+
inputs=this.step.permitted_params
92+
options=(hash
93+
pairConnector="set"
94+
inputTypes="association"
95+
keyPlaceholder="admin.wizard.param_key"
96+
valuePlaceholder="admin.wizard.submission_key"
97+
context="step"
98+
)
99+
}}
100+
</div>
101+
</div>
104102

105103
{{wizard-links
106104
itemType="field"

‎assets/javascripts/discourse/components/wizard-subscription-container.hbs‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎assets/javascripts/discourse/components/wizard-subscription-container.js‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎assets/javascripts/discourse/components/wizard-subscription-selector.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,7 @@ export default SingleSelectComponent.extend({
5151
value
5252
);
5353

54-
let subscriptionRequired =
55-
allowedSubscriptionTypes.length &&
56-
!allowedSubscriptionTypes.includes("none");
54+
let subscriptionRequired = false;
5755

5856
let attrs = {
5957
id: value,

‎assets/javascripts/discourse/templates/admin-wizards-wizard-show.hbs‎

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -122,63 +122,61 @@
122122
</div>
123123
</div>
124124

125-
{{#wizard-subscription-container}}
126-
<div class="setting">
127-
<div class="setting-label">
128-
<label>{{i18n "admin.wizard.required"}}</label>
129-
</div>
130-
<div class="setting-value">
131-
<Input @type="checkbox" @checked={{this.wizard.required}} />
132-
<span>{{i18n "admin.wizard.required_label"}}</span>
133-
</div>
125+
<div class="setting">
126+
<div class="setting-label">
127+
<label>{{i18n "admin.wizard.required"}}</label>
134128
</div>
129+
<div class="setting-value">
130+
<Input @type="checkbox" @checked={{this.wizard.required}} />
131+
<span>{{i18n "admin.wizard.required_label"}}</span>
132+
</div>
133+
</div>
135134

136-
<div class="setting">
137-
<div class="setting-label">
138-
<label>{{i18n "admin.wizard.restart_on_revisit"}}</label>
139-
</div>
140-
<div class="setting-value">
141-
<Input @type="checkbox" @checked={{this.wizard.restart_on_revisit}} />
142-
<span>{{i18n "admin.wizard.restart_on_revisit_label"}}</span>
143-
</div>
135+
<div class="setting">
136+
<div class="setting-label">
137+
<label>{{i18n "admin.wizard.restart_on_revisit"}}</label>
144138
</div>
139+
<div class="setting-value">
140+
<Input @type="checkbox" @checked={{this.wizard.restart_on_revisit}} />
141+
<span>{{i18n "admin.wizard.restart_on_revisit_label"}}</span>
142+
</div>
143+
</div>
145144

146-
<div class="setting full field-mapper-setting">
147-
<div class="setting-label">
148-
<label>{{i18n "admin.wizard.permitted"}}</label>
149-
</div>
150-
<div class="setting-value">
151-
{{wizard-mapper
152-
inputs=this.wizard.permitted
153-
options=(hash
154-
context="wizard"
155-
inputTypes="assignment,validation"
156-
groupSelection="output"
157-
guestGroup=true
158-
userFieldSelection="key"
159-
textSelection="value"
160-
inputConnector="and"
161-
)
162-
}}
163-
</div>
145+
<div class="setting full field-mapper-setting">
146+
<div class="setting-label">
147+
<label>{{i18n "admin.wizard.permitted"}}</label>
148+
</div>
149+
<div class="setting-value">
150+
{{wizard-mapper
151+
inputs=this.wizard.permitted
152+
options=(hash
153+
context="wizard"
154+
inputTypes="assignment,validation"
155+
groupSelection="output"
156+
guestGroup=true
157+
userFieldSelection="key"
158+
textSelection="value"
159+
inputConnector="and"
160+
)
161+
}}
164162
</div>
163+
</div>
165164

166-
<div class="setting full">
167-
<div class="setting-label">
168-
<label>{{i18n "admin.wizard.after_time_groups.label"}}</label>
169-
</div>
170-
<div class="setting-value">
171-
<GroupChooser
172-
@content={{this.site.groups}}
173-
@value={{this.afterTimeGroupIds}}
174-
@onChange={{this.setAfterTimeGroups}}
175-
/>
176-
<div class="setting-gutter">
177-
{{i18n "admin.wizard.after_time_groups.description"}}
178-
</div>
165+
<div class="setting full">
166+
<div class="setting-label">
167+
<label>{{i18n "admin.wizard.after_time_groups.label"}}</label>
168+
</div>
169+
<div class="setting-value">
170+
<GroupChooser
171+
@content={{this.site.groups}}
172+
@value={{this.afterTimeGroupIds}}
173+
@onChange={{this.setAfterTimeGroups}}
174+
/>
175+
<div class="setting-gutter">
176+
{{i18n "admin.wizard.after_time_groups.description"}}
179177
</div>
180178
</div>
181-
{{/wizard-subscription-container}}
179+
</div>
182180
</div>
183181

184182
{{wizard-links

‎assets/javascripts/discourse/templates/admin-wizards.hbs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
route="adminWizardsManager"
1919
label="admin.wizard.manager.nav_label"
2020
}}
21-
22-
<div class="admin-actions">
23-
<WizardSubscriptionStatus />
24-
</div>
2521
{{/admin-nav}}
2622

2723
<div class="admin-container">

0 commit comments

Comments
 (0)