Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create Group additionally options #244

Open
wants to merge 24 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
233e091
addParams (public_exit&public_admission)
bonsaibauer Apr 13, 2023
359d813
addParams (public_exit&public_admission)
bonsaibauer Apr 13, 2023
17f7ecc
addParams (public_exit&public_admission)
bonsaibauer Apr 13, 2023
7d0bde2
addParams (public_exit&public_admission)
bonsaibauer Apr 13, 2023
de48cd1
addParams (public_exit&public_admission)
bonsaibauer Apr 13, 2023
ac71bb9
addParams (public_exit&public_admission)
bonsaibauer Apr 13, 2023
e07a5ac
addParams (public_exit&public_admission)
bonsaibauer Apr 13, 2023
1255d05
addParams (public_exit&public_admission)
bonsaibauer Apr 13, 2023
34229ab
addParams (primary_group)
bonsaibauer Apr 14, 2023
dc9df6c
addParams (primary_group)
bonsaibauer Apr 14, 2023
654a00d
addParams (primary_group)
bonsaibauer Apr 14, 2023
3ac50bc
addParams (primary_group)
bonsaibauer Apr 14, 2023
30b2651
addParams (primary_group)
bonsaibauer Apr 14, 2023
0d5c939
addParams (primary_group)
bonsaibauer Apr 14, 2023
12bdf64
addParams (primary_group)
bonsaibauer Apr 14, 2023
235ff68
addParams (primary_group)
bonsaibauer Apr 14, 2023
092fd10
Exclude "Administratoren" Group
bonsaibauer Apr 17, 2023
bafb09a
Exclude "Administratoren"
bonsaibauer Apr 17, 2023
ac5d41d
Update custom-wizard-group-selector.js.es6
bonsaibauer Apr 17, 2023
9c43f89
Update custom-wizard-group-selector.js.es6
bonsaibauer Apr 21, 2023
007ab7a
Update custom-wizard-group-selector.js.es6
bonsaibauer Apr 21, 2023
7b3d848
Update custom-wizard-group-selector.js.es6
bonsaibauer Apr 21, 2023
908bca7
Merge pull request #1 from paviliondev/main
bonsaibauer Jun 1, 2023
2b96fc5
Merge pull request #2 from paviliondev/main
bonsaibauer Jun 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/controllers/custom_wizard/admin/wizard.rb
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,10 @@ def save_wizard_params
visibility_level: mapped_params,
members_visibility_level: mapped_params,
add_event: mapped_params,
add_location: mapped_params
add_location: mapped_params,
public_exit: mapped_params,
public_admission: mapped_params,
primary_group: mapped_params
]
)
end
Expand Down
6 changes: 6 additions & 0 deletions assets/javascripts/discourse/lib/wizard-schema.js.es6
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@ const action = {
visibility_level: null,
members_visibility_level: null,
custom_fields: null,
public_exit: true,
public_admission: true,
primary_group: true,
},
},
mapped: [
Expand Down Expand Up @@ -205,6 +208,9 @@ const action = {
"members_visibility_level",
"add_event",
"add_location",
"public_exit",
"public_admission",
"primary_group",
],
required: ["id", "type"],
dependent: {},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,60 @@
)}}
</div>
</div>
<div class="setting full field-mapper-setting">
<div class="setting-label">
<label>{{i18n "admin.wizard.action.create_group.public_exit"}}</label>
</div>

<div class="setting-value">
{{wizard-mapper
inputs=action.public_exit
property="public_exit"
onUpdate=(action "mappedFieldUpdated")
options=(hash
textSelection=true
wizardFieldSelection=true
userFieldSelection=true
context="action"
)}}
</div>
</div>
<div class="setting full field-mapper-setting">
<div class="setting-label">
<label>{{i18n "admin.wizard.action.create_group.public_admission"}}</label>
</div>

<div class="setting-value">
{{wizard-mapper
inputs=action.public_admission
property="public_admission"
onUpdate=(action "mappedFieldUpdated")
options=(hash
textSelection=true
wizardFieldSelection=true
userFieldSelection=true
context="action"
)}}
</div>
</div>
<div class="setting full field-mapper-setting">
<div class="setting-label">
<label>{{i18n "admin.wizard.action.create_group.primary_group"}}</label>
</div>

<div class="setting-value">
{{wizard-mapper
inputs=action.primary_group
property="primary_group"
onUpdate=(action "mappedFieldUpdated")
options=(hash
textSelection=true
wizardFieldSelection=true
userFieldSelection=true
context="action"
)}}
</div>
</div>
{{/if}}

{{#if createCategory}}
Expand Down
3 changes: 3 additions & 0 deletions config/locales/client.de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,9 @@ de:
messageable_level: Nachrichtbare Ebene
visibility_level: Sichtbarkeitsstufe
members_visibility_level: Sichtbarkeitsstufe der Mitglieder
public_exit: Erlaube Gruppenaustritt
public_admission: Erlaube der Gruppe beizutreten
primary_group: Primäre Gruppe
custom_field:
nav_label: "Benutzerdefinierte Felder"
add: "Hinzufügen"
Expand Down
3 changes: 3 additions & 0 deletions config/locales/client.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,9 @@ en:
messageable_level: Messageable Level
visibility_level: Visibility Level
members_visibility_level: Members Visibility Level
public_exit: Allow Group exit
public_admission: Allow Group joining
primary_group: Primary Group

custom_field:
nav_label: "Custom Fields"
Expand Down
3 changes: 3 additions & 0 deletions lib/custom_wizard/action.rb
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,9 @@ def new_group_params
visibility_level
members_visibility_level
grant_trust_level
public_exit
public_admission
primary_group
).each do |attr|
input = action[attr]

Expand Down
26 changes: 25 additions & 1 deletion spec/fixtures/actions/create_group.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,5 +100,29 @@
"output_type": "text",
"output_connector": "set"
}
],
"public_exit": [
{
"type": "assignment",
"output": "false",
"output_type": "text",
"output_connector": "set"
}
],
"public_admission": [
{
"type": "assignment",
"output": "false",
"output_type": "text",
"output_connector": "set"
}
],
"primary_group": [
{
"type": "assignment",
"output": "false",
"output_type": "text",
"output_connector": "set"
}
]
}
}
26 changes: 25 additions & 1 deletion spec/fixtures/actions/create_group_bad_user.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,5 +100,29 @@
"output_type": "text",
"output_connector": "set"
}
],
"public_exit": [
{
"type": "assignment",
"output": "false",
"output_type": "text",
"output_connector": "set"
}
],
"public_admission": [
{
"type": "assignment",
"output": "false",
"output_type": "text",
"output_connector": "set"
}
],
"primary_group": [
{
"type": "assignment",
"output": "false",
"output_type": "text",
"output_connector": "set"
}
]
}
}