Commit 30be3cf5 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' into 'master'

Don't show "Welcome to GitLab" when the search didn't return any projects

Fixes #13785. /cc @pixdrift

### Before

![Screen_Shot_2016-03-02_at_10.55.02](/uploads/b6b6ead2143d01e374ad296e72182d79/Screen_Shot_2016-03-02_at_10.55.02.png)

### After

![Screen_Shot_2016-03-02_at_12.12.33](/uploads/6e16c44e69039c534ea0fc3373c6060b/Screen_Shot_2016-03-02_at_12.12.33.png)

See merge request !3059
parents 773718cb f9ec3300
...@@ -18,6 +18,7 @@ v 8.5.2 ...@@ -18,6 +18,7 @@ v 8.5.2
- Fix broken icons on installations with relative URL (Artem Sidorenko) - Fix broken icons on installations with relative URL (Artem Sidorenko)
- Fix import from gitlab.com (KazSawada) - Fix import from gitlab.com (KazSawada)
- Fix help keyboard shortcut on relative URL setups (Artem Sidorenko) - Fix help keyboard shortcut on relative URL setups (Artem Sidorenko)
- Don't show "Welcome to GitLab" when the search didn't return any projects
v 8.5.1 v 8.5.1
- Fix group projects styles - Fix group projects styles
......
...@@ -6,7 +6,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController ...@@ -6,7 +6,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
@projects = @projects.sort(@sort = params[:sort]) @projects = @projects.sort(@sort = params[:sort])
@projects = @projects.includes(:namespace) @projects = @projects.includes(:namespace)
terms = params['filter_projects'] terms = params[:filter_projects]
if terms.present? if terms.present?
@projects = @projects.search(terms) @projects = @projects.search(terms)
...@@ -35,7 +35,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController ...@@ -35,7 +35,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
@projects = @projects.includes(:namespace, :forked_from_project, :tags) @projects = @projects.includes(:namespace, :forked_from_project, :tags)
@projects = @projects.sort(@sort = params[:sort]) @projects = @projects.sort(@sort = params[:sort])
terms = params['filter_projects'] terms = params[:filter_projects]
if terms.present? if terms.present?
@projects = @projects.search(terms) @projects = @projects.search(terms)
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
- if @last_push - if @last_push
= render "events/event_last_push", event: @last_push = render "events/event_last_push", event: @last_push
- if @projects.any? - if @projects.any? || params[:filter_projects]
= render 'projects' = render 'projects'
- else - else
= render "zero_authorized_projects" = render "zero_authorized_projects"
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
Show all Show all
= paginate projects, theme: "gitlab" if projects.respond_to? :total_pages = paginate projects, theme: "gitlab" if projects.respond_to? :total_pages
- else - else
%h3 No projects found .nothing-here-block No projects found
:javascript :javascript
new ProjectsList(); new ProjectsList();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment