fixing auto export settings
This commit is contained in:
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
Binary file not shown.
@@ -463,7 +463,6 @@ def rower_favoritecharts_view(request, userid=0):
|
|||||||
|
|
||||||
|
|
||||||
@login_required()
|
@login_required()
|
||||||
@permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True)
|
|
||||||
def rower_exportsettings_view(request, userid=0):
|
def rower_exportsettings_view(request, userid=0):
|
||||||
attrtokens = {
|
attrtokens = {
|
||||||
'polar_auto_import': 'polartoken',
|
'polar_auto_import': 'polartoken',
|
||||||
@@ -512,7 +511,6 @@ def rower_exportsettings_view(request, userid=0):
|
|||||||
if form.is_valid():
|
if form.is_valid():
|
||||||
cd = form.cleaned_data
|
cd = form.cleaned_data
|
||||||
for attr, value in cd.items():
|
for attr, value in cd.items():
|
||||||
doset = True
|
|
||||||
try:
|
try:
|
||||||
tokenname = attrtokens[attr]
|
tokenname = attrtokens[attr]
|
||||||
if (getattr(r, tokenname) == '' or getattr(r, tokenname) is None) and value:
|
if (getattr(r, tokenname) == '' or getattr(r, tokenname) is None) and value:
|
||||||
@@ -520,27 +518,11 @@ def rower_exportsettings_view(request, userid=0):
|
|||||||
request, 'Set '+attr+' but it will not be effective until you create a connection.'
|
request, 'Set '+attr+' but it will not be effective until you create a connection.'
|
||||||
)
|
)
|
||||||
except KeyError:
|
except KeyError:
|
||||||
doset = True
|
pass
|
||||||
if not user_is_not_basic(r.user): # pragma: no cover
|
|
||||||
if not user_is_coachee(r.user):
|
|
||||||
doset = False
|
|
||||||
if not doset: # pragma: no cover
|
|
||||||
before = getattr(r, attr)
|
|
||||||
if before == value:
|
|
||||||
doset = True
|
|
||||||
if doset:
|
|
||||||
setattr(r, attr, value)
|
setattr(r, attr, value)
|
||||||
else: # pragma: no cover
|
|
||||||
if user_is_not_basic(r.user):
|
|
||||||
messages.error(
|
|
||||||
request, 'Could not set '+attr+'. You need to create the connection first.')
|
|
||||||
|
|
||||||
|
|
||||||
r.save()
|
r.save()
|
||||||
if doset:
|
|
||||||
messages.info(request, 'Settings saved')
|
messages.info(request, 'Settings saved')
|
||||||
else: # pragma: no cover
|
|
||||||
messages.error(request, 'Settings not saved: Need a Pro account')
|
|
||||||
else:
|
else:
|
||||||
form = RowerExportForm(instance=r)
|
form = RowerExportForm(instance=r)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user