Merge pull request #123 from hongwei1/master

bugfix/#sonarcloud: Change this code to not perform redirects based o…
This commit is contained in:
Simon Redfern 2021-03-16 09:09:27 +01:00 committed by GitHub
commit e6750a2e3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions

View File

@ -38,14 +38,25 @@
<select class="connector_name form-control " }>
{% if method_routing.connector_name == "mapped" %}
<option value="mapped">mapped</option> # This will be selected
<option value="internal">internal</option>
<option value="kafka_vSept2018">kafka_vSept2018</option>
<option value="akka_vDec2018">akka_vDec2018</option>
<option value="rest_vMar2019">rest_vMar2019</option>
<option value="kafka_vMay2019">kafka_vMay2019</option>
<option value="stored_procedure_vDec2019">stored_procedure_vDec2019</option>
{% elif method_routing.connector_name == "internal" %}
<option value="internal">internal</option>
<option value="mapped">mapped</option>
<option value="stored_procedure_vDec2019">stored_procedure_vDec2019</option>
<option value="kafka_vMay2019">kafka_vMay2019</option>
<option value="rest_vMar2019">rest_vMar2019</option>
<option value="kafka_vSept2018">kafka_vSept2018</option>
<option value="mapped">mapped</option>
<option value="akka_vDec2018">akka_vDec2018</option>
{% elif method_routing.connector_name == "kafka_vSept2018" %}
<option value="kafka_vSept2018">kafka_vSept2018</option> # This will be selected
<option value="mapped">mapped</option>
<option value="internal">internal</option>
<option value="akka_vDec2018">akka_vDec2018</option>
<option value="rest_vMar2019">rest_vMar2019</option>
<option value="kafka_vMay2019">kafka_vMay2019</option>
@ -69,6 +80,7 @@
<option value="rest_vMar2019">rest_vMar2019</option>
<option value="kafka_vSept2018">kafka_vSept2018</option>
<option value="mapped">mapped</option>
<option value="internal">internal</option>
<option value="akka_vDec2018">akka_vDec2018</option>
<option value="stored_procedure_vDec2019">stored_procedure_vDec2019</option>
{% elif method_routing.connector_name == "stored_procedure_vDec2019" %}
@ -77,6 +89,7 @@
<option value="rest_vMar2019">rest_vMar2019</option>
<option value="kafka_vSept2018">kafka_vSept2018</option>
<option value="mapped">mapped</option>
<option value="internal">internal</option>
<option value="akka_vDec2018">akka_vDec2018</option>
{% endif %}
</select>

View File

@ -283,6 +283,6 @@ class DeleteEntitlementView(LoginRequiredMixin, View):
elif ("/users/myuser/user_id/" in str(redirect_url_from_gui)):
redirect_url = reverse('my-user-detail',kwargs={"user_id":kwargs['user_id']})
else:
redirect_url = redirect_url_from_gui
redirect_url = reverse('users-index')
return HttpResponseRedirect(redirect_url)