Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository 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
gong
gor
Commits
01280b67
Commit
01280b67
authored
8 years ago
by
sramos
Browse files
Options
Downloads
Patches
Plain Diff
Bug en administracion de usuarios
svn path=/tags/gong-gor-2.52/; revision=7994
parent
4eb3eb88
No related branches found
Tags
gong-gor-2.52
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/views/usuario/_listado_relaciones_elemento.html.erb
+1
-1
1 addition, 1 deletion
app/views/usuario/_listado_relaciones_elemento.html.erb
with
1 addition
and
1 deletion
app/views/usuario/_listado_relaciones_elemento.html.erb
+
1
−
1
View file @
01280b67
...
...
@@ -12,7 +12,7 @@
<div
class=
"elementoderecha"
>
<%
if
elemento
.
grupo_usuario_id
%>
<%=
ventana_info_popup
elemento
,
{
:campos
=>
[[
_
(
"Asignado en Grupo"
),
"1"
,
"grupo_usuario.nombre"
]],
:id
=>
update
+
"_informacion"
}
%>
<%
elsif
(
tipo
!=
"agente"
||
@agente
.
id
==
elemento
.
agente_id
)
%>
<%
elsif
params
[
:seccion
]
==
"administracion"
||
tipo
!=
"agente"
||
(
@agente
&&
@agente
.
id
==
elemento
.
agente_id
)
%>
<%=
editar
(
:url
=>
{
action:
'asignar_relacion'
,
id:
@usuario
.
id
,
tipo:
tipo
,
elemento_id:
elemento
.
id
,
update:
update
,
update_listado:
update_listado
})
%>
<%=
borrado
(
:url
=>
{
action:
'desasignar_relacion'
,
id:
@usuario
.
id
,
tipo:
tipo
,
elemento_id:
elemento
.
id
,
update:
update
},
:texto
=>
(
_
(
"Vinculación con: "
)
+
tipo
.
capitalize
+
" '"
+
elemento
.
send
(
tipo
).
nombre
+
"'"
),
:identificador
=>
update
)
%>
<%
end
%>
...
...
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