Bookmarks

- Show bookmarks or not if not exist in db
kaiquewdev · Oct 1, 2011 · 879543c · 879543c
1 parent 3b393a6
commit 879543c
Show file tree

Hide file tree

Showing 23 changed files with 101,513 additions and 17 deletions.
diff --git a/__init__.pyc b/__init__.pyc
diff --git a/controllers/bookmark.py b/controllers/bookmark.py
@@ -26,6 +26,7 @@ def new():
 								keywords = form.vars.keywords,
 								status = 'public',
 								creation = request.now)
+
 			response.flash = T('{0} was created !').format(form.vars.name)
 		elif form.errors:
 			response.flash = T('Oops, look who\'s wrong !')
@@ -34,11 +35,11 @@ def new():
 
 @auth.requires_login()
 def show():
-		'''
-		Mostra os bookmarks
-		'''
-		mymarks = db().select(Bookmarks.ALL, orderby=Bookmarks.creation)
-		return {'marks':mymarks}
+    '''
+    Mostra os bookmarks
+    '''
+    mymarks = db(Bookmarks.user == auth.user.email).select()
+    return {'marks':mymarks}
 
 @auth.requires_login()
 def remove():

diff --git a/databases/c8b669d15150d7109e5f7ab36744a5b7_bookmarks.table b/databases/c8b669d15150d7109e5f7ab36744a5b7_bookmarks.table
@@ -57,13 +57,13 @@ p21
 ssS'user_ass'
 p22
 (dp23
-S'sortable'
+S'type'
 p24
-I2
-sS'type'
-p25
 S'string'
+p25
+sS'sortable'
 p26
+I2
 sS'sql'
 p27
 S'CHAR(512)'
@@ -113,13 +113,13 @@ p42
 ssS'description'
 p43
 (dp44
-S'sortable'
+S'type'
 p45
-I5
-sS'type'
-p46
 S'text'
+p46
+sS'sortable'
 p47
+I5
 sS'sql'
 p48
 S'TEXT'

diff --git a/databases/storage.sqlite b/databases/storage.sqlite
diff --git a/errors/127.0.0.1.2011-10-01.12-11-37.6b2dab73-ede2-4991-8ec6-751536a0f7c7 b/errors/127.0.0.1.2011-10-01.12-11-37.6b2dab73-ede2-4991-8ec6-751536a0f7c7
diff --git a/errors/127.0.0.1.2011-10-01.12-11-49.aef23049-7735-4081-80cf-d855f323494d b/errors/127.0.0.1.2011-10-01.12-11-49.aef23049-7735-4081-80cf-d855f323494d
diff --git a/errors/127.0.0.1.2011-10-01.12-12-04.a0778049-669b-42b4-bf4d-3e26b1c7bb1a b/errors/127.0.0.1.2011-10-01.12-12-04.a0778049-669b-42b4-bf4d-3e26b1c7bb1a
diff --git a/errors/127.0.0.1.2011-10-01.12-12-16.732aae93-9b86-481e-9a1a-2b190a77e65d b/errors/127.0.0.1.2011-10-01.12-12-16.732aae93-9b86-481e-9a1a-2b190a77e65d
diff --git a/errors/127.0.0.1.2011-10-01.12-12-37.129aaac6-48c9-4618-a933-783848b8eba0 b/errors/127.0.0.1.2011-10-01.12-12-37.129aaac6-48c9-4618-a933-783848b8eba0
diff --git a/errors/127.0.0.1.2011-10-01.12-13-12.28a38d45-e3c3-418e-9af1-7366d3a7d619 b/errors/127.0.0.1.2011-10-01.12-13-12.28a38d45-e3c3-418e-9af1-7366d3a7d619
diff --git a/errors/127.0.0.1.2011-10-01.12-13-12.504ea7cd-3751-48de-9a9e-211df79c7917 b/errors/127.0.0.1.2011-10-01.12-13-12.504ea7cd-3751-48de-9a9e-211df79c7917
diff --git a/errors/127.0.0.1.2011-10-01.12-13-59.95b1acf4-82a4-4b4f-b296-82122f73c4a7 b/errors/127.0.0.1.2011-10-01.12-13-59.95b1acf4-82a4-4b4f-b296-82122f73c4a7