Commit 0629b161 authored by Bianca Aguilar's avatar Bianca Aguilar

Fixing conflicts on my end

parents fa94d592 230dce56
...@@ -19,8 +19,7 @@ class WidgetUser(models.Model): ...@@ -19,8 +19,7 @@ class WidgetUser(models.Model):
department = models.ForeignKey(Department, on_delete = models.CASCADE) department = models.ForeignKey(Department, on_delete = models.CASCADE)
@property def __str__(self):
def full_name(self):
return '{}, {} {}'.format(self.last_name, self.first_name, self.middle_name) return '{}, {} {}'.format(self.last_name, self.first_name, self.middle_name)
@property @property
...@@ -30,4 +29,4 @@ class WidgetUser(models.Model): ...@@ -30,4 +29,4 @@ class WidgetUser(models.Model):
@property @property
def user_info(self): def user_info(self):
return '<br>{}: {}, {}, {}'.format(self.full_name, self.id_num, self.email, self.department.dept_info) return '<br>{}: {}, {}, {}'.format(self.__str__, self.id_num, self.email, self.department.dept_info)
\ No newline at end of file \ No newline at end of file
from django.shortcuts import render
from django.http import HttpResponse from django.http import HttpResponse
from .models import WidgetUser from .models import WidgetUser
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment