diff options
| author | Cédric Bonhomme <kimble.mandel+bitbucket@gmail.com> | 2015-05-15 07:24:18 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <kimble.mandel+bitbucket@gmail.com> | 2015-05-15 07:24:18 +0200 |
| commit | dd059ad8a7d94ea6d03639e10e4d41c95dd1cebd (patch) | |
| tree | 8aa3c0bf481a67717987af0710540668d3467ab0 /pyaggr3g470r/models | |
| parent | The list of inactive feeds is now sorted. (diff) | |
| parent | testing special controller methods (diff) | |
| download | newspipe-dd059ad8a7d94ea6d03639e10e4d41c95dd1cebd.tar.gz newspipe-dd059ad8a7d94ea6d03639e10e4d41c95dd1cebd.tar.bz2 newspipe-dd059ad8a7d94ea6d03639e10e4d41c95dd1cebd.zip | |
Merged in jaesivsm/pyaggr3g470r (pull request #13)
introducing unittests !
Diffstat (limited to 'pyaggr3g470r/models')
| -rw-r--r-- | pyaggr3g470r/models/__init__.py | 3 | ||||
| -rw-r--r-- | pyaggr3g470r/models/article.py | 11 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pyaggr3g470r/models/__init__.py b/pyaggr3g470r/models/__init__.py index 42903f4e..ba52b0de 100644 --- a/pyaggr3g470r/models/__init__.py +++ b/pyaggr3g470r/models/__init__.py @@ -98,4 +98,5 @@ def db_create(db): user1.roles.extend([role_admin, role_user]) db.session.add(user1) - db.session.commit()
\ No newline at end of file + db.session.commit() + return role_admin, role_user diff --git a/pyaggr3g470r/models/article.py b/pyaggr3g470r/models/article.py index 58cd0384..16f15b9e 100644 --- a/pyaggr3g470r/models/article.py +++ b/pyaggr3g470r/models/article.py @@ -66,14 +66,15 @@ class Article(db.Model): .order_by(asc("Article.date")).first() def __repr__(self): - return json.dumps({ - "title": self.title, - "link": self.link, - "content": self.content - }) + return json.dumps({"title": self.title, + "link": self.link, + "content": self.content + }) def dump(self): return {"id": self.id, + "user_id": self.user_id, + "entry_id": self.entry_id, "title": self.title, "link": self.link, "content": self.content, |