seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

user_pref change 

recording_pref chage from enum to normal integer values in user.rb
This commit is contained in:
Nuwan 2025-02-06 09:17:10 +05:30
parent 71458e3983
commit 4a3630f786
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jam-ui/src/components/page/JKAccountPreferences.js
View File

@ -80,8 +80,8 @@ const JKAccountPreferences = () => {
value="1" value="1"
data-testid="recording_pref_my_audio" data-testid="recording_pref_my_audio"
onClick={() => setSelectedPref(1)} /> onClick={() => setSelectedPref(1)} />
<Label for="exampleSelect" className='mr-1'>{t('preferences.recording_preferences.options.my_audio')}</Label> <Label for="exampleSelect" className='mr-1'>{t('preferences.recording_preferences.options.my_audio')}<JKTooltip title={t('preferences.recording_preferences.options.my_audio_tooltip')} /></Label>
<JKTooltip title={t('preferences.recording_preferences.options.my_audio_tooltip')} />
</FormGroup> </FormGroup>
<FormGroup> <FormGroup>
<Input <Input
@ -91,8 +91,7 @@ const JKAccountPreferences = () => {
value="2" value="2"
data-testid="recording_pref_my_audio_and_session_mix" data-testid="recording_pref_my_audio_and_session_mix"
onClick={() => setSelectedPref(2)} /> onClick={() => setSelectedPref(2)} />
<Label for="exampleSelect" className='mr-1'>{t('preferences.recording_preferences.options.my_audio_and_session_mix')}</Label> <Label for="exampleSelect" className='mr-1'>{t('preferences.recording_preferences.options.my_audio_and_session_mix')}<JKTooltip title={t('preferences.recording_preferences.options.my_audio_and_session_mix_tooltip')} /></Label>
<JKTooltip title={t('preferences.recording_preferences.options.my_audio_and_session_mix_tooltip')} />
</FormGroup> </FormGroup>
</Form> </Form>
</CardBody> </CardBody>

9
ruby/lib/jam_ruby/models/user.rb
View File

@ -65,12 +65,9 @@ module JamRuby
ESCALATION_REASON_SETUP_WIZARD_FAILURE = "Setup Wizard Failure" ESCALATION_REASON_SETUP_WIZARD_FAILURE = "Setup Wizard Failure"
ESCALATION_REASON_OTHER = "Other" ESCALATION_REASON_OTHER = "Other"
ESCALATION_REASONS = [ESCALATION_REASON_NO_AUDIO_STREAM, ESCALATION_REASON_NO_VIDEO_STREAM, ESCALATION_REASON_SETUP_WIZARD_FAILURE, ESCALATION_REASON_OTHER] ESCALATION_REASONS = [ESCALATION_REASON_NO_AUDIO_STREAM, ESCALATION_REASON_NO_VIDEO_STREAM, ESCALATION_REASON_SETUP_WIZARD_FAILURE, ESCALATION_REASON_OTHER]
RECORDING_PREF_NO_RECORDING = 0
enum :recording_pref, [ RECORDING_PREF_OWN_TRACKS = 1
{no_recording: 0}, RECORDING_PREF_OWN_TRACKS_AND_SESSION_MIX = 2
{own_tracks: 1},
{own_tracks_and_session_mix: 2}
]
devise :database_authenticatable, :recoverable, :rememberable devise :database_authenticatable, :recoverable, :rememberable