diff --git a/app/controllers/users/settings_controller.rb b/app/controllers/users/settings_controller.rb index 0fdf38dd1..3194d4e89 100644 --- a/app/controllers/users/settings_controller.rb +++ b/app/controllers/users/settings_controller.rb @@ -447,6 +447,7 @@ class Users::SettingsController < ApplicationController def reset_tutorial if @user.update(tutorial_status: 0) && params[:org][:id] + @user.update(current_organization_id: params[:org][:id]) cookies.delete :tutorial_data cookies.delete :current_tutorial_step cookies[:repeat_tutorial_org_id] = { diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index 140bd58fd..012703440 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -111,9 +111,6 @@ <% end %> -<%= render partial: 'projects/index/introductory_popup' %> -<%= javascript_include_tag 'projects/introdutory_popup' %> - <% if current_organization.projects.length> 0 %> <%= render partial: "projects/index/org_projects", locals: { org: current_organization, diff --git a/config/locales/en.yml b/config/locales/en.yml index 3bf8e8868..9e614fae1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1119,8 +1119,8 @@ en: team_name_help: "Team name is required in order to create your own team." settings: changed_org_flash: "You are working on %{team} now!" - changed_org_error_flash: "Something get wrong! Try again later." - changed_org_in_search: "The searched item is not in your current team. You will be redirected on %{team} team!" + changed_org_error_flash: "Something went wrong! Try again later." + changed_org_in_search: "The searched item is not in your current team. You will be redirected to %{team} team!" navigation: preferences: "My preferences" organizations: "My teams"