Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tupá
Manage
Activity
Members
Labels
Plan
Issues
13
Issue boards
Milestones
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sistemas
Tupá
Commits
b8d2a820
Commit
b8d2a820
authored
11 months ago
by
Sergio Vier
Browse files
Options
Downloads
Patches
Plain Diff
Permite rechazar una solicitud en procesamiento
parent
29ef7600
No related branches found
No related tags found
1 merge request
!170
Permite rechazar una solicitud en procesamiento
Pipeline
#3082
passed with warnings with stages
in 4 minutes and 40 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
backend/php/solicitudes/usuarios/ci_solicitudes_usuarios.php
+0
-1
0 additions, 1 deletion
backend/php/solicitudes/usuarios/ci_solicitudes_usuarios.php
with
1 addition
and
1 deletion
CHANGELOG.md
+
1
−
0
View file @
b8d2a820
...
...
@@ -3,6 +3,7 @@
## CHANGELOG
[
CURRENT
](
/../compare/master...develop
)
*
Permite rechazar una solicitud estado "Procesando" o en procesamiento
*
Se migra version de toba 3.0.30 -> 3.2.4
*
Soporte para Araí
*
Integración inicial del instalador, docker-builder
This diff is collapsed.
Click to expand it.
backend/php/solicitudes/usuarios/ci_solicitudes_usuarios.php
+
0
−
1
View file @
b8d2a820
...
...
@@ -140,7 +140,6 @@ class ci_solicitudes_usuarios extends tupa_ci
if
(
$this
->
s__registro
->
getEstadoActual
()
==
Registro
::
ESTADO_REGISTRO_PROCESANDO
)
{
$this
->
pantalla
()
->
evento
(
'procesar_solicitud'
)
->
anular
();
$this
->
pantalla
()
->
evento
(
'rechazar_solicitud'
)
->
anular
();
$this
->
pantalla
()
->
evento
(
'crear_usuario'
)
->
restituir
();
$this
->
pantalla
()
->
evento
(
'vincular_usuario'
)
->
restituir
();
}
elseif
(
$this
->
s__registro
->
getEstadoActual
()
==
Registro
::
ESTADO_SOLICITUD_ENVIADO
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment