diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-05 15:02:47 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-05 15:02:47 +0000 |
| commit | 9bf85c01a909db0cb7633710fa99143ffd1196ab (patch) | |
| tree | 6ce71c50be9d1b2670c97460cc3d296a4d9e3438 /app/views/dashboard | |
| parent | 0c449e36eab2df5f3ea2532c6276d551094cf9b7 (diff) | |
| parent | f1102b3373ecd294e625edf541d47552d5dc489f (diff) | |
| download | gitlab-ce-9bf85c01a909db0cb7633710fa99143ffd1196ab.tar.gz | |
Merge branch 'paginate-dashboard-projects' into 'master'
Page project list on dashboard
See merge request !2689
Diffstat (limited to 'app/views/dashboard')
| -rw-r--r-- | app/views/dashboard/_projects_head.html.haml | 3 | ||||
| -rw-r--r-- | app/views/dashboard/projects/_projects.html.haml | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml index d865a2c6fae..d46998ec1e9 100644 --- a/app/views/dashboard/_projects_head.html.haml +++ b/app/views/dashboard/_projects_head.html.haml @@ -13,7 +13,8 @@ Explore Projects .nav-controls - = search_field_tag :filter_projects, nil, placeholder: 'Filter by name...', class: 'projects-list-filter form-control hidden-xs input-short', spellcheck: false + = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f| + = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'project-filter-form-field form-control input-short', spellcheck: false, id: 'project-filter-form-field' = render 'explore/projects/dropdown' - if current_user.can_create_project? = link_to new_project_path, class: 'btn btn-new' do diff --git a/app/views/dashboard/projects/_projects.html.haml b/app/views/dashboard/projects/_projects.html.haml index cea9ffcc748..933a3edd0f0 100644 --- a/app/views/dashboard/projects/_projects.html.haml +++ b/app/views/dashboard/projects/_projects.html.haml @@ -1,3 +1,6 @@ .projects-list-holder = render 'shared/projects/list', projects: @projects, ci: true + + :javascript + Dashboard.init() |