Browse Source

Fix(OnlyOffice): Remove substituição incorreta de URL

Remove lógica que substituía URL do OnlyOffice remoto por localhost
quando a URL continha 'onlyoffice' no hostname.
pull/3858/head
rangelbruno 8 months ago
parent
commit
e63a4374f0
  1. 4
      sapl/base/onlyoffice_template_views.py
  2. 8
      sapl/materia/onlyoffice_materia_views.py
  3. 6
      sapl/materia/onlyoffice_views.py
  4. 4
      sapl/norma/onlyoffice_views.py
  5. 4
      sapl/protocoloadm/onlyoffice_views.py

4
sapl/base/onlyoffice_template_views.py

@ -236,10 +236,6 @@ def template_onlyoffice_editor(request, pk):
# URL do OnlyOffice acessível pelo navegador do usuário
onlyoffice_url = settings.ONLYOFFICE_URL
if 'onlyoffice:' in onlyoffice_url or 'onlyoffice/' in onlyoffice_url:
protocol = 'https' if request.is_secure() else 'http'
host = request.get_host().split(':')[0]
onlyoffice_url = f"{protocol}://{host}:8001"
context = {
'documento': template,

8
sapl/materia/onlyoffice_materia_views.py

@ -259,10 +259,6 @@ def materia_onlyoffice_editor(request, pk):
# URL do OnlyOffice acessível pelo navegador do usuário
onlyoffice_url = settings.ONLYOFFICE_URL
if 'onlyoffice:' in onlyoffice_url or 'onlyoffice/' in onlyoffice_url:
protocol = 'https' if request.is_secure() else 'http'
host = request.get_host().split(':')[0]
onlyoffice_url = f"{protocol}://{host}:8001"
context = {
'documento': materia,
@ -510,10 +506,6 @@ def docacessorio_onlyoffice_editor(request, pk):
# URL do OnlyOffice acessível pelo navegador do usuário
onlyoffice_url = settings.ONLYOFFICE_URL
if 'onlyoffice:' in onlyoffice_url or 'onlyoffice/' in onlyoffice_url:
protocol = 'https' if request.is_secure() else 'http'
host = request.get_host().split(':')[0]
onlyoffice_url = f"{protocol}://{host}:8001"
context = {
'documento': documento,

6
sapl/materia/onlyoffice_views.py

@ -303,13 +303,7 @@ def onlyoffice_editor(request, pk):
return redirect('sapl.materia:proposicao_detail', pk=pk)
# URL do OnlyOffice acessível pelo navegador do usuário
# Se ONLYOFFICE_URL contém 'onlyoffice' (nome do container), substitui pelo host da requisição
onlyoffice_url = settings.ONLYOFFICE_URL
if 'onlyoffice:' in onlyoffice_url or 'onlyoffice/' in onlyoffice_url:
# É a URL interna do Docker, precisa usar a URL externa
protocol = 'https' if request.is_secure() else 'http'
host = request.get_host().split(':')[0] # Remove porta se existir
onlyoffice_url = f"{protocol}://{host}:8001"
context = {
'proposicao': proposicao,

4
sapl/norma/onlyoffice_views.py

@ -255,10 +255,6 @@ def norma_onlyoffice_editor(request, pk):
# URL do OnlyOffice acessível pelo navegador do usuário
onlyoffice_url = settings.ONLYOFFICE_URL
if 'onlyoffice:' in onlyoffice_url or 'onlyoffice/' in onlyoffice_url:
protocol = 'https' if request.is_secure() else 'http'
host = request.get_host().split(':')[0]
onlyoffice_url = f"{protocol}://{host}:8001"
context = {
'documento': norma,

4
sapl/protocoloadm/onlyoffice_views.py

@ -256,10 +256,6 @@ def docadm_onlyoffice_editor(request, pk):
# URL do OnlyOffice acessível pelo navegador do usuário
onlyoffice_url = settings.ONLYOFFICE_URL
if 'onlyoffice:' in onlyoffice_url or 'onlyoffice/' in onlyoffice_url:
protocol = 'https' if request.is_secure() else 'http'
host = request.get_host().split(':')[0]
onlyoffice_url = f"{protocol}://{host}:8001"
context = {
'documento': documento,

Loading…
Cancel
Save