Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
c15c0144
Commit
c15c0144
authored
Oct 15, 2018
by
detraz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remplace trnoname par de meilleurs affichages
parent
3b11d351
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
machines/models.py
machines/models.py
+5
-0
machines/templates/machines/aff_machines.html
machines/templates/machines/aff_machines.html
+1
-1
No files found.
machines/models.py
View file @
c15c0144
...
...
@@ -213,6 +213,11 @@ class Machine(RevMixin, FieldPermissionModelMixin, models.Model):
interface_parent__machine
=
self
).
values_list
(
'name'
,
flat
=
True
).
distinct
()
@
cached_property
def
get_name
(
self
):
"""Return a name : user provided name or first interface name"""
return
self
.
name
or
self
.
short_name
@
cached_property
def
all_complete_names
(
self
):
"""Renvoie tous les tls complets de la machine"""
...
...
machines/templates/machines/aff_machines.html
View file @
c15c0144
...
...
@@ -52,7 +52,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td
colspan=
"4"
>
{% trans "No name" as tr_no_name %}
{% trans "View the profile" as tr_view_the_profile %}
<b>
{{ machine.name|default:'
<i>
tr_no_name
</i>
' }}
</b>
<i
class=
"fa fa-angle-right"
></i>
<b>
{{ machine.
get_
name|default:'
<i>
tr_no_name
</i>
' }}
</b>
<i
class=
"fa fa-angle-right"
></i>
<a
href=
"{% url 'users:profil' userid=machine.user.id %}"
title=
tr_view_the_profile
>
<i
class=
"fa fa-user"
></i>
{{ machine.user }}
</a>
...
...
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