Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
djangoldp-polls
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Applications
etuc
djangoldp-polls
Commits
86d84b92
Commit
86d84b92
authored
4 years ago
by
Benoit Alessandroni
Browse files
Options
Downloads
Plain Diff
Merge branch 'patch-3' into 'master'
bugfix: Update models.py See merge request
!9
parents
77514e87
ce32f06c
No related branches found
Branches containing commit
Tags
v0.0.6
Tags containing commit
1 merge request
!9
bugfix: Update models.py
Pipeline
#6924
passed
4 years ago
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
djangoldp_polls/models.py
+3
-4
3 additions, 4 deletions
djangoldp_polls/models.py
with
3 additions
and
4 deletions
djangoldp_polls/models.py
+
3
−
4
View file @
86d84b92
...
...
@@ -2,14 +2,13 @@ from django.conf import settings
from
django.db
import
models
from
djangoldp.models
import
Model
from
django.db.models
import
Sum
from
django.contrib.auth
import
get_user_model
from
djangoldp_conversation.models
import
Conversation
from
djangoldp_circle.models
import
Circle
User
=
settings
.
AUTH_USER_MODEL
User
.
name
=
User
.
get_full_name
# User = settings.AUTH_USER_MODEL
# User.name=User.get_full_name
#========================
...
...
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