Changeset 112 in bookmarks for trunk/lib/Bookmarks/Controller.pm
- Timestamp:
- 02/17/16 22:05:50 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/Bookmarks/Controller.pm
r108 r112 71 71 } 72 72 73 sub _get_search_from_request { 74 my $self = shift; 75 76 my @tags = grep { $_ ne '' } $self->request->param('tag'); 77 my $query = $self->request->param('q'); 78 my $limit = $self->request->param('limit'); 79 my $offset = $self->request->param('offset'); 80 my $page = $self->request->param('page'); 81 82 return $self->bookmarks->search({ 83 query => $query, 84 tags => \@tags, 85 limit => $limit, 86 offset => $offset, 87 page => $page, 88 }); 89 } 90 73 91 sub list { 74 92 my $self = shift; … … 79 97 my $format = $self->request->param('format') || 'html'; 80 98 81 my @tags = grep { $_ ne '' } $self->request->param('tag');82 my $query = $self->request->param('q');83 my $limit = $self->request->param('limit');84 my $offset = $self->request->param('offset');85 my $page = $self->request->param('page');86 87 99 my $list = Bookmarks::List->new({ 88 100 bookmarks => $self->bookmarks, 89 search => $self->bookmarks->search({ 90 query => $query, 91 tags => \@tags, 92 limit => $limit, 93 offset => $offset, 94 page => $page, 95 }), 101 search => $self->_get_search_from_request, 96 102 }); 97 103 … … 101 107 } 102 108 return $list->$as_format; 109 } 110 111 sub sidebar { 112 my $self = shift; 113 114 my $list = Bookmarks::List->new({ 115 bookmarks => $self->bookmarks, 116 search => $self->_get_search_from_request, 117 }); 118 119 require Template; 120 require File::Basename; 121 my $template = Template->new({ INCLUDE_PATH => File::Basename::dirname($INC{'Bookmarks/List.pm'}) }); 122 123 my @all_tags = $list->bookmarks->get_tags({ selected => @{ $list->tags }[0] }); 124 my @cotags = $list->bookmarks->get_cotags({ search => $list->search }); 125 126 $template->process( 127 'list.tt', 128 { 129 base_url => $list->bookmarks->base_uri, 130 title => $list->title, 131 query => $list->query, 132 selected_tag => @{ $list->tags }[0], 133 search_tags => $list->tags, 134 links => [ $list->_get_list_links('text/html', { q => $list->query, tag => $list->tags }) ], 135 all_tags => \@all_tags, 136 cotags => \@cotags, 137 resources => $list->results, 138 pages => $list->search->pages, 139 }, 140 \my $output, 141 ); 142 return [200, ['Content-Type' => 'text/html; charset=UTF-8'], [$output]]; 103 143 } 104 144
Note: See TracChangeset
for help on using the changeset viewer.