diff options
| author | Dennis Tang <750946-dennis@users.noreply.gitlab.com> | 2019-08-02 06:43:31 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-08-02 06:43:31 +0000 |
| commit | 2330ad3c3b453a3605094403396b354ddaafca19 (patch) | |
| tree | fcb4a8c5fae72e3d11bebf6fe0aa1b27cb6d504f /app | |
| parent | cb497dd4bcb3b67dcef70d62a9a1b8fbc6d95c09 (diff) | |
| download | gitlab-ce-2330ad3c3b453a3605094403396b354ddaafca19.tar.gz | |
Resolve Incorrect empty state message on "Explore projects"
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/explore/projects/_projects.html.haml | 3 | ||||
| -rw-r--r-- | app/views/explore/projects/trending.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/projects/_list.html.haml | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/app/views/explore/projects/_projects.html.haml b/app/views/explore/projects/_projects.html.haml index 67f2f897137..35b32662b8a 100644 --- a/app/views/explore/projects/_projects.html.haml +++ b/app/views/explore/projects/_projects.html.haml @@ -1 +1,2 @@ -= render 'shared/projects/list', projects: projects, user: current_user +- is_explore_page = defined?(explore_page) && explore_page += render 'shared/projects/list', projects: projects, user: current_user, explore_page: is_explore_page diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml index ed508fa2506..153c90e534e 100644 --- a/app/views/explore/projects/trending.html.haml +++ b/app/views/explore/projects/trending.html.haml @@ -10,4 +10,4 @@ = render 'explore/head' = render 'explore/projects/nav' unless Feature.enabled?(:project_list_filter_bar) && current_user -= render 'projects', projects: @projects += render 'projects', projects: @projects, explore_page: true diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml index 576ec3e1782..67cb1aa549c 100644 --- a/app/views/shared/projects/_list.html.haml +++ b/app/views/shared/projects/_list.html.haml @@ -21,6 +21,7 @@ - own_projects_current_user_empty_message_header = s_('UserProfile|You haven\'t created any personal projects.') - own_projects_current_user_empty_message_description = s_('UserProfile|Your projects can be available publicly, internally, or privately, at your choice.') - own_projects_visitor_empty_message = s_('UserProfile|This user doesn\'t have any personal projects') +- explore_page_empty_message = s_('UserProfile|Explore public groups to find projects to contribute to.') - primary_button_label = _('New project') - primary_button_link = new_project_path - secondary_button_label = _('Explore groups') @@ -58,4 +59,4 @@ current_user_empty_message_description: own_projects_current_user_empty_message_description, primary_button_label: primary_button_label, primary_button_link: primary_button_link, - visitor_empty_message: own_projects_visitor_empty_message } + visitor_empty_message: defined?(explore_page) && explore_page ? explore_page_empty_message : own_projects_visitor_empty_message } |