:wqMerge branch 'devel' of github.com:danmunn/redmine_dmsf into devel

danmunn · Oct 3, 2024 · 6896256 · 6896256
2 parents 5e81d5e + 88bab64
commit 6896256
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/views/hooks/redmine_dmsf/_view_my_account.html.erb b/app/views/hooks/redmine_dmsf/_view_my_account.html.erb
@@ -31,12 +31,13 @@
 <% if Setting.plugin_redmine_dmsf['dmsf_webdav_authentication'] == 'Digest' %>
   <p>
     <label for='webdav_digest_reset'><%= l(:label_dmsf_webdav_digest) %></label>
-    <% token = Token.find_by(user_id: @user.id, action: 'dmsf-webdav-digest') %>
+    <% token = Token.find_by(user_id: @user.id, action: 'dmsf_webdav_digest') %>
     <% if token %>
       <%= l(:label_dmsf_webdav_digest_created_on, distance_of_time_in_words(Time.now, token.created_on)) %>
+      (<%= link_to l(:button_reset), dmsf_digest_path, remote: true, id: 'webdav_digest_reset' %>)
     <% else %>
       <%= l(:label_missing_dmsf_webdav_digest) %>
+      (<%= link_to l(:button_add), dmsf_digest_path, remote: true, id: 'webdav_digest_reset' %>)
     <% end %>
-    (<%= link_to l(:button_reset), dmsf_digest_path, remote: true, id: 'webdav_digest_reset' %>)
   </p>
 <% end %>
diff --git a/lib/redmine_dmsf.rb b/lib/redmine_dmsf.rb
@@ -72,7 +72,9 @@
 
 # Hooks
 def require_hooks
+  require "#{File.dirname(__FILE__)}/redmine_dmsf/hooks/controllers/account_controller_hooks"
   require "#{File.dirname(__FILE__)}/redmine_dmsf/hooks/controllers/issues_controller_hooks"
+  require "#{File.dirname(__FILE__)}/redmine_dmsf/hooks/controllers/search_controller_hooks"
   require "#{File.dirname(__FILE__)}/redmine_dmsf/hooks/views/view_projects_form_hook"
   require "#{File.dirname(__FILE__)}/redmine_dmsf/hooks/views/base_view_hooks"
   require "#{File.dirname(__FILE__)}/redmine_dmsf/hooks/views/custom_field_view_hooks"