discourse
/
discourse-assign
mirror of https://github.com/discourse/discourse-assign.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: properly check key values for shortcuts

This commit is contained in:
Isaac Janzen 2023-04-28 12:23:07 -05:00
parent a655a009fa
commit 1f89b68e0f
No known key found for this signature in database
GPG Key ID: D75AF9C21FD8EBCD
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/javascripts/discourse-assign/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs
View File

@ -11,7 +11,7 @@
@valueProperty="value" @valueProperty="value"
@value={{assignableLevel}} @value={{assignableLevel}}
@content={{assignableLevelOptions}} @content={{assignableLevelOptions}}
@class="groups-form-assignable-level" class="groups-form-assignable-level"
@onChange={{action (mut model.assignable_level)}} @onChange={{action (mut model.assignable_level)}}
/> />
</div> </div>

4
assets/javascripts/discourse-assign/controllers/assign-user.js
View File

@ -72,8 +72,8 @@ export default Controller.extend(ModalFunctionality, {
}, },
@action @action
handleTextAreaKeydown(value, event) { handleTextAreaKeydown(value) {
if ((event.ctrlKey || event.metaKey) && event.key === "Enter") { if ((value.ctrlKey || value.metaKey) && value.key === "Enter") {
this.assign(); this.assign();
} }
}, },

2
assets/javascripts/discourse/templates/components/remind-assigns-frequency.hbs
View File

@ -2,7 +2,7 @@
<div class="controls controls-dropdown"> <div class="controls controls-dropdown">
<label>{{i18n "discourse_assign.reminders_frequency.description"}}</label> <label>{{i18n "discourse_assign.reminders_frequency.description"}}</label>
<ComboBox <ComboBox
@id="remind-assigns-frequency" id="remind-assigns-frequency"
@valueProperty="value" @valueProperty="value"
@content={{availableFrequencies}} @content={{availableFrequencies}}
@value={{selectedFrequency}} @value={{selectedFrequency}}

18
assets/javascripts/discourse/templates/modal/assign-user.hbs
View File

@ -1,4 +1,4 @@
<DModalBody @class="assign"> <DModalBody class="assign">
<div> <div>
<div class="control-group {{if this.assigneeError 'assignee-error'}}"> <div class="control-group {{if this.assigneeError 'assignee-error'}}">
<label>{{i18n "discourse_assign.assign_modal.assignee_label"}}</label> <label>{{i18n "discourse_assign.assign_modal.assignee_label"}}</label>
@ -35,7 +35,7 @@
<div class="control-group assign-status"> <div class="control-group assign-status">
<label>{{i18n "discourse_assign.assign_modal.status_label"}}</label> <label>{{i18n "discourse_assign.assign_modal.status_label"}}</label>
<ComboBox <ComboBox
@id="assign-status" id="assign-status"
@content={{availableStatuses}} @content={{availableStatuses}}
@value={{status}} @value={{status}}
@onChange={{action (mut model.status)}} @onChange={{action (mut model.status)}}
@ -60,16 +60,16 @@
</DModalBody> </DModalBody>
<div class="modal-footer"> <div class="modal-footer">
{{d-button <DButton
label=(if @label={{(if
model.reassign model.reassign
"discourse_assign.reassign.title" "discourse_assign.reassign.title"
"discourse_assign.assign_modal.assign" "discourse_assign.assign_modal.assign"
) )}}
icon=inviteIcon @icon={{inviteIcon}}
action=(action "assign") @action={{(action "assign")}}
class="btn-primary" class="btn-primary"
disabled=disabled @disabled={{disabled}}
}} />
<DModalCancel @close={{route-action "closeModal"}} /> <DModalCancel @close={{route-action "closeModal"}} />
</div> </div>