Accidentally left out of last commit.
This commit is contained in:
parent
2c20d60f9e
commit
b7b88f25a3
|
@ -38,10 +38,12 @@ class Notebooks( object ):
|
||||||
@expose( view = Main_page )
|
@expose( view = Main_page )
|
||||||
@validate(
|
@validate(
|
||||||
notebook_id = Valid_id(),
|
notebook_id = Valid_id(),
|
||||||
|
note_id = Valid_id(),
|
||||||
)
|
)
|
||||||
def default( self, notebook_id ):
|
def default( self, notebook_id, note_id = None ):
|
||||||
return dict(
|
return dict(
|
||||||
notebook_id = notebook_id,
|
notebook_id = notebook_id,
|
||||||
|
note_id = note_id,
|
||||||
)
|
)
|
||||||
|
|
||||||
@expose( view = Json )
|
@expose( view = Json )
|
||||||
|
@ -52,9 +54,10 @@ class Notebooks( object ):
|
||||||
@update_client
|
@update_client
|
||||||
@validate(
|
@validate(
|
||||||
notebook_id = Valid_id(),
|
notebook_id = Valid_id(),
|
||||||
|
note_id = Valid_id( none_okay = True ),
|
||||||
user_id = Valid_id( none_okay = True ),
|
user_id = Valid_id( none_okay = True ),
|
||||||
)
|
)
|
||||||
def contents( self, notebook_id, user_id ):
|
def contents( self, notebook_id, note_id = None, user_id = None ):
|
||||||
self.check_access( notebook_id, user_id, self.__scheduler.thread )
|
self.check_access( notebook_id, user_id, self.__scheduler.thread )
|
||||||
if not ( yield Scheduler.SLEEP ):
|
if not ( yield Scheduler.SLEEP ):
|
||||||
raise Access_error()
|
raise Access_error()
|
||||||
|
@ -64,6 +67,7 @@ class Notebooks( object ):
|
||||||
|
|
||||||
yield dict(
|
yield dict(
|
||||||
notebook = notebook,
|
notebook = notebook,
|
||||||
|
note = notebook.lookup_note( note_id ),
|
||||||
)
|
)
|
||||||
|
|
||||||
@expose( view = Json )
|
@expose( view = Json )
|
||||||
|
|
Reference in New Issue