Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scheduling-system
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
SMASCH
scheduling-system
Commits
47889b33
Commit
47889b33
authored
4 years ago
by
piotr.gawron
Browse files
Options
Downloads
Patches
Plain Diff
health partner name should include address
parent
1fec0227
No related branches found
No related tags found
1 merge request
!252
Tns lab ids updated
Pipeline
#26769
passed
4 years ago
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
smash/web/models/worker.py
+2
-2
2 additions, 2 deletions
smash/web/models/worker.py
with
2 additions
and
2 deletions
smash/web/models/worker.py
+
2
−
2
View file @
47889b33
...
...
@@ -301,7 +301,7 @@ class Worker(models.Model):
def
__str__
(
self
):
if
self
.
name
!=
''
:
if
self
.
first_name
==
''
:
return
self
.
name
return
"
%s (%s, %s)
"
%
(
self
.
name
,
self
.
address
,
self
.
city
)
else
:
return
"
%s %s %s
"
%
(
self
.
name
,
self
.
first_name
,
self
.
last_name
)
else
:
...
...
@@ -310,7 +310,7 @@ class Worker(models.Model):
def
__unicode__
(
self
):
if
self
.
name
!=
''
:
if
self
.
first_name
==
''
:
return
self
.
name
return
"
%s (%s, %s)
"
%
(
self
.
name
,
self
.
address
,
self
.
city
)
else
:
return
"
%s %s %s
"
%
(
self
.
name
,
self
.
first_name
,
self
.
last_name
)
else
:
...
...
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