sch/Slixfeed
sch/Slixfeed
3
1
Fork 1
Code Issues 15 Pull requests Projects Releases Packages Wiki Activity Actions

Use boolean instead of a list-single with one option

Browse source
This commit is contained in:
Stephen Paul Weber 2024-02-18 21:56:12 -05:00
parent 88261571d1
commit 3a59d5ff16
No known key found for this signature in database
GPG key ID: D11C2911CE519CDE
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
slixfeed/xmpp/client.py
View file

@ -693,15 +693,14 @@ class Slixfeed(slixmpp.ClientXMPP):
# session['notes'] = [['info', response]]
form = self['xep_0004'].make_form('form', 'Subscription')
form['instructions'] = ('Subscription already exists at index {}.'
'\n'
'Would you want to edit this subscription?'
.format(result['index']))
options = form.add_field(var='subscription',
ftype='list-single',
label='Subscription',
desc='Continue to edit subscription.',
value=result['link'])
options.addOption(result['name'], result['link'])
form.add_field(ftype='boolean',
var='edit',
label='Would you want to edit this subscription?')
form.add_field(var='subscription',
ftype='hidden',
value=result['link'])
# NOTE Should we allow "Complete"?
# Do all clients provide button "Cancel".
session['allow_complete'] = False
@ -724,18 +723,13 @@ class Slixfeed(slixmpp.ClientXMPP):
form['instructions'] = ('New subscription'
'\n'
'"{}"'
'\n\n'
'Continue to edit subscription?'
.format(result['name'], result['index']))
options = form.add_field(var='subscription',
ftype='list-single',
# Should Gajim allows editing text-single
# field when form is of type "result"?
# ftype='text-single',
label='Subscription',
desc='Continue to edit subscription.',
value=result['link'])
options.addOption(result['name'], result['link'])
form.add_field(ftype='boolean',
var='edit',
label='Continue to edit subscription?')
form.add_field(var='subscription',
ftype='hidden',
value=result['link'])
session['allow_complete'] = True
session['allow_prev'] = False
session['has_next'] = False
@ -844,6 +838,10 @@ class Slixfeed(slixmpp.ClientXMPP):
jid = session['from'].bare
jid_file = jid
db_file = config.get_pathname_to_database(jid_file)
if 'edit' in payload['values'] and not payload['values']['edit']:
session['payload'] = None
session['next'] = None
return session
if 'subscription' in payload['values']:
urls = payload['values']['subscription']
elif 'subscriptions' in payload['values']: