diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 4525176ac..62bef8fb1 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -361,7 +361,7 @@ private def login_without_softapplication referer = request.headers['Referer'] - require_login unless referer =~ /softapplication/ + require_login unless referer =~ /softapplication/ || referer =~ /memos/ end def renderTag diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index dfacff864..47f33f34a 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -181,7 +181,7 @@ module ProjectsHelper # unless project.is_public == 1 if project.is_public != 1 - s = "#{l(:lable_private)}".html_safe + s = "#{l(:label_private)}".html_safe else s = "".html_safe end @@ -197,7 +197,7 @@ module ProjectsHelper if !project.is_public # end longjun - s = "#{l(:lable_private)}".html_safe + s = "#{l(:label_private)}".html_safe else s = "".html_safe end