diff --git a/app/views/settings/_dmsf_settings.html.erb b/app/views/settings/_dmsf_settings.html.erb index 8dedab1b..bc9665ac 100644 --- a/app/views/settings/_dmsf_settings.html.erb +++ b/app/views/settings/_dmsf_settings.html.erb @@ -207,13 +207,20 @@

<%= content_tag :label, l(:label_webdav) %> + <% webdav_disabled = Redmine::Plugin.installed?(:easy_extensions) && EasyHostingServices::EasyMultiTenancy.activated? %> <%= select_tag 'settings[dmsf_webdav]', options_for_select([ [l(:select_option_deactivated), nil], [l(:select_option_activated), '1']], - selected: @settings['dmsf_webdav']) %> + selected: @settings['dmsf_webdav'], + disabled: webdav_disabled) %> - <%= l(:note_webdav, protocol: Setting.protocol, domain: Setting.host_name).html_safe %> <%= l(:label_default) %>: <%= l(:select_option_activated) %> + <% if webdav_disabled %> + <%= l(:note_webdav_disabled) %> + <% else %> + <%= l(:note_webdav, protocol: Setting.protocol, domain: Setting.host_name).html_safe %> + <%= l(:label_default) %>: <%= l(:select_option_activated) %> + <% end %>

diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 002f1e4b..4587ed79 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -413,6 +413,8 @@ cs: dmsf_webdav_ignore_1b_file_for_authentication_info: Total Commander WebDAV plugin text_not_empty: Adresář není prázdný. + label_scroll_down: Posunout se dolů + note_webdav_disabled: WebDAV je zablokovaný. Kontaktujte administrátora. easy_pages: modules: diff --git a/config/locales/de.yml b/config/locales/de.yml index 4b2e4e6c..50dac368 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -412,6 +412,8 @@ de: dmsf_webdav_ignore_1b_file_for_authentication_info: Total Commander WebDAV plugin text_not_empty: Der Ordner ist nich leer. + label_scroll_down: Runterscrollen + note_webdav_disabled: WebDAV is disabled. Contact the administrator. easy_pages: modules: diff --git a/config/locales/en.yml b/config/locales/en.yml index cbea3481..400bcc8c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -413,6 +413,8 @@ en: dmsf_webdav_ignore_1b_file_for_authentication_info: Total Commander WebDAV plugin text_not_empty: The folder is not empty. + label_scroll_down: Scroll down + note_webdav_disabled: WebDAV is disabled. Contact the administrator. easy_pages: modules: diff --git a/config/locales/es.yml b/config/locales/es.yml index 71e20c96..1bad0a84 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -413,6 +413,8 @@ es: dmsf_webdav_ignore_1b_file_for_authentication_info: Total Commander WebDAV plugin text_not_empty: The folder is not empty. + label_scroll_down: Scroll down + note_webdav_disabled: WebDAV is disabled. Contact the administrator. easy_pages: modules: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ee653d12..b59e5fe9 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -413,6 +413,8 @@ fr: dmsf_webdav_ignore_1b_file_for_authentication_info: Total Commander WebDAV plugin text_not_empty: The folder is not empty. + label_scroll_down: Scroll down + note_webdav_disabled: WebDAV is disabled. Contact the administrator. easy_pages: modules: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 4ca411e5..bc5df1e8 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -412,6 +412,8 @@ hu: dmsf_webdav_ignore_1b_file_for_authentication_info: Total Commander WebDAV plugin text_not_empty: The folder is not empty. + label_scroll_down: Scroll down + note_webdav_disabled: WebDAV is disabled. Contact the administrator. easy_pages: modules: diff --git a/config/locales/it.yml b/config/locales/it.yml index 4dd11ac0..55f62023 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -413,6 +413,8 @@ it: # Italian strings thx 2 Matteo Arceci! dmsf_webdav_ignore_1b_file_for_authentication_info: Total Commander WebDAV plugin text_not_empty: The folder is not empty. + label_scroll_down: Scroll down + note_webdav_disabled: WebDAV is disabled. Contact the administrator. easy_pages: modules: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 8e22ac90..23aa8097 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -413,6 +413,8 @@ ja: dmsf_webdav_ignore_1b_file_for_authentication_info: Total Commander WebDAV plugin text_not_empty: The folder is not empty. + label_scroll_down: Scroll down + note_webdav_disabled: WebDAV is disabled. Contact the administrator. easy_pages: modules: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index e3f752fe..fa1bc27e 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -412,6 +412,8 @@ ko: dmsf_webdav_ignore_1b_file_for_authentication_info: Total Commander WebDAV plugin text_not_empty: The folder is not empty. + label_scroll_down: Scroll down + note_webdav_disabled: WebDAV is disabled. Contact the administrator. easy_pages: modules: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 2e103ce6..5ef318c5 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -413,6 +413,8 @@ nl: dmsf_webdav_ignore_1b_file_for_authentication_info: Total Commander WebDAV plugin text_not_empty: The folder is not empty. + label_scroll_down: Scroll down + note_webdav_disabled: WebDAV is disabled. Contact the administrator. easy_pages: modules: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index e439be44..78cbc726 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -413,6 +413,8 @@ pl: dmsf_webdav_ignore_1b_file_for_authentication_info: Total Commander WebDAV plugin text_not_empty: The folder is not empty. + label_scroll_down: Scroll down + note_webdav_disabled: WebDAV is disabled. Contact the administrator. easy_pages: modules: diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index e5cb6727..bfaeb358 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -413,6 +413,8 @@ pt-BR: dmsf_webdav_ignore_1b_file_for_authentication_info: Total Commander WebDAV plugin text_not_empty: The folder is not empty. + label_scroll_down: Scroll down + note_webdav_disabled: WebDAV is disabled. Contact the administrator. easy_pages: modules: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 9de9e9af..b28bc2a3 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -413,6 +413,8 @@ ru: dmsf_webdav_ignore_1b_file_for_authentication_info: Плагин WebDAV программы Total Commander text_not_empty: The folder is not empty. + label_scroll_down: Scroll down + note_webdav_disabled: WebDAV is disabled. Contact the administrator. easy_pages: modules: diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 4c0cd975..db7095b6 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -413,6 +413,8 @@ sl: dmsf_webdav_ignore_1b_file_for_authentication_info: Total Commander WebDAV plugin text_not_empty: The folder is not empty. + label_scroll_down: Scroll down + note_webdav_disabled: WebDAV is disabled. Contact the administrator. easy_pages: modules: diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 6566c546..c3418c4b 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -412,6 +412,8 @@ zh-TW: dmsf_webdav_ignore_1b_file_for_authentication_info: Total Commander WebDAV plugin text_not_empty: The folder is not empty. + label_scroll_down: Scroll down + note_webdav_disabled: WebDAV is disabled. Contact the administrator. easy_pages: modules: diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 488d2315..90f87c2d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -413,6 +413,8 @@ zh: dmsf_webdav_ignore_1b_file_for_authentication_info: Total Commander WebDAV plugin text_not_empty: The folder is not empty. + label_scroll_down: Scroll down + note_webdav_disabled: WebDAV is disabled. Contact the administrator. easy_pages: modules: diff --git a/init.rb b/init.rb index aa27f3ae..81a867c9 100644 --- a/init.rb +++ b/init.rb @@ -45,7 +45,7 @@ Redmine::Plugin.register :redmine_dmsf do 'dmsf_index_database' => File.expand_path('dmsf_index', Rails.root), 'dmsf_stemming_lang' => 'english', 'dmsf_stemming_strategy' => 'STEM_NONE', - 'dmsf_webdav' => '1', + 'dmsf_webdav' => (Redmine::Plugin.installed?(:easy_extensions) && EasyHostingServices::EasyMultiTenancy.activated?) ? nil : '1', 'dmsf_display_notified_recipients' => nil, 'dmsf_global_title_format' => '', 'dmsf_columns' => %w(title size modified version workflow author),