Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
manhattan
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
InnovacionDocente
manhattan
Commits
27edd95c
Commit
27edd95c
authored
Jun 24, 2020
by
Enrique Matías Sánchez (Quique)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix Tratamiento de advertencias al consultar WS de Identidades
parent
3a6a4840
Pipeline
#584
failed with stage
in 1 second
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
models.py
accounts/models.py
+7
-5
views.py
indo/views.py
+3
-1
No files found.
accounts/models.py
View file @
27edd95c
...
...
@@ -127,7 +127,9 @@ class CustomUser(AbstractUser):
@classmethod
def
get_nips_vinculacion
(
cls
,
cod_vinculacion
):
"""Devuelve los NIPs que tengan el código de vinculación indicado."""
"""Devuelve los NIPs que tengan el código de vinculación indicado.
También devuelve la descripción de la advertencia en caso de producirse."""
wsdl
=
get_config
(
'WSDL_VINCULACIONES'
)
session
=
Session
()
session
.
auth
=
HTTPBasicAuth
(
...
...
@@ -143,15 +145,15 @@ class CustomUser(AbstractUser):
raise
e
response
=
client
.
service
.
mostrarVinculaciones
(
cod_vinculacion
)
if
response
.
aviso
:
# El WS produjo una advertencia. La mostramos y seguimos
.
messages
.
warning
(
strategy
.
request
,
response
.
descripcionAviso
)
# Si el WS produce una advertencia, la devolveremos con el resultado para mostrarla
.
advertencia
=
response
.
descripcionAviso
if
response
.
aviso
else
None
if
response
.
error
:
# La comunicación con el WS fue correcta, pero éste devolvió un error. Finalizamos.
raise
Exception
(
response
.
descripcionResultado
)
return
response
.
nipsInteger
return
advertencia
,
response
.
nipsInteger
# Custom Manager
objects
=
CustomUserManager
()
indo/views.py
View file @
27edd95c
...
...
@@ -295,7 +295,9 @@ class ProyectoEvaluadorUpdateView(LoginRequiredMixin, PermissionRequiredMixin, U
def
get
(
self
,
request
,
*
args
,
**
kwargs
):
User
=
get_user_model
()
# Obtenemos los NIPs de los usuarios con vinculación «Evaluador externo innovacion ACPUA».
nip_evaluadores
=
User
.
get_nips_vinculacion
(
60
)
advertencia
,
nip_evaluadores
=
User
.
get_nips_vinculacion
(
60
)
if
advertencia
:
messages
.
warning
(
request
,
advertencia
)
nip_evaluadores
=
[
str
(
nip
)
for
nip
in
nip_evaluadores
]
# nip_evaluadores = ['136040', '327618', '329639', '370109'] # XXX - Desarrollo
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment