plugin wip
This commit is contained in:
@ -47,8 +47,8 @@ class BookmarkFolders extends ApiController {
|
||||
$responseType = 'error';
|
||||
$response = 'There was an error creating your folder.';
|
||||
} else {
|
||||
$responseType = 'success';
|
||||
$response = 'success';
|
||||
$responseType = 'id';
|
||||
$response = $result;
|
||||
}
|
||||
Views::view( 'api.response', ['response' => json_encode( [ $responseType => $response ], true )]);
|
||||
}
|
||||
@ -68,4 +68,3 @@ class BookmarkFolders extends ApiController {
|
||||
Views::view( 'api.response', ['response' => json_encode( [ $responseType => $response ], true )]);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -70,12 +70,11 @@ class Bookmarks extends Controller {
|
||||
$folderObject->title = $folder->title;
|
||||
$folderObject->color = $folder->color;
|
||||
$folderObject->bookmarkListRows = Views::simpleView( 'bookmarks.components.bookmarkListRows', $folderObject->bookmarks );
|
||||
$panel->panel = Views::simpleView( 'bookmarks.components.bookmarkListPanel', [$folderObject] );
|
||||
$panelArray[] = $panel;
|
||||
$panelArray[] = $folderObject;
|
||||
}
|
||||
}
|
||||
Components::set( 'foldersList', Views::simpleView( 'bookmarks.folders.list', $folders ) );
|
||||
Components::set( 'folderPanels', Views::simpleView( 'bookmarks.components.folderPanelList', $panelArray ) );
|
||||
Components::set( 'folderPanels', Views::simpleView( 'bookmarks.components.bookmarkListPanel', $panelArray ) );
|
||||
Components::set( 'bookmarksList', Views::simpleView( 'bookmarks.bookmarks.list', $bookmarks ) );
|
||||
return Views::view( 'bookmarks.dash' );
|
||||
}
|
||||
@ -121,8 +120,8 @@ class Bookmarks extends Controller {
|
||||
$folderObject->bookmarkListRows = Views::simpleView( 'bookmarks.components.bookmarkListRows', $folderObject->bookmarks );
|
||||
$panel->panel = Views::simpleView( 'bookmarks.components.bookmarkListPanel', [$folderObject] );
|
||||
$panelArray[] = $panel;
|
||||
|
||||
return Views::view( 'bookmarks.components.folderPanelList', $panelArray );
|
||||
|
||||
return Views::view( 'bookmarks.bookmarks.listPage', $panelArray );
|
||||
}
|
||||
|
||||
public function createBookmark( $id = null ) {
|
||||
@ -227,7 +226,7 @@ class Bookmarks extends Controller {
|
||||
if ( $folder == false ) {
|
||||
$folders = self::$folders->byUser();
|
||||
Components::set( 'foldersList', Views::simpleView( 'bookmarks.folders.list', $folders ) );
|
||||
return Views::view( 'bookmarks.folders.listPage', $folders );
|
||||
return Views::view( 'bookmarks.folders.listPage' );
|
||||
}
|
||||
if ( $folder->createdBy != App::$activeUser->ID ) {
|
||||
Session::flash( 'error', 'You do not have permission to view this folder.' );
|
||||
|
Reference in New Issue
Block a user