aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2016-09-23 16:53:09 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2016-10-05 13:18:11 +0200
commitd4c35c39e4da64c42869bba806a6e4fefb8db379 (patch)
tree4b4d19163b9aa1107b63c1c1ddd16dedaf7d0487 /server/sonar-web/src
parent39f5cdb58ba46a8b62b6816d59dc62c011fb6ba2 (diff)
downloadsonarqube-d4c35c39e4da64c42869bba806a6e4fefb8db379.tar.gz
sonarqube-d4c35c39e4da64c42869bba806a6e4fefb8db379.zip
Remove dead ruby code around editable_password?
Diffstat (limited to 'server/sonar-web/src')
-rw-r--r--server/sonar-web/src/main/webapp/WEB-INF/app/views/account/notifications.html.erb75
-rw-r--r--server/sonar-web/src/main/webapp/WEB-INF/lib/need_authentication.rb12
2 files changed, 0 insertions, 87 deletions
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/notifications.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/notifications.html.erb
deleted file mode 100644
index 29ac2b1ce1d..00000000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/account/notifications.html.erb
+++ /dev/null
@@ -1,75 +0,0 @@
-<div class="page">
-
- <div class="pull-left big-spacer-right abs-width-240">
- <div class="panel panel-white">
- <div class="text-center">
- <% if configuration('sonar.lf.enableGravatar', 'true') == 'true' %>
- <div class="js-avatar big-spacer-bottom"></div>
- <% end %>
- <h2 id="name" class="text-ellipsis" title="<%= current_user.name -%>"><%= current_user.name -%></h2>
- <p id="login" class="note text-ellipsis" title="<%= current_user.login -%>"><%= current_user.login -%></p>
- <div class="text-center spacer-top">
- <p id="email" class="text-ellipsis" title="<%= current_user.email -%>"><%= current_user.email -%></p>
- </div>
- </div>
-
- <div class="big-spacer-top">
- <h3 class="text-center"><%= message('my_profile.groups') -%></h3>
- <ul id="groups">
- <% current_user.groups.sort.each do |group| -%>
- <li class="text-ellipsis" title="<%= group.name -%>"><%= group.name -%></li>
- <% end -%>
- </ul>
- </div>
-
- <div class="big-spacer-top">
- <h3 class="text-center"><%= message('my_profile.scm_accounts') -%></h3>
- <ul id="scm-accounts">
- <% current_user.full_scm_accounts.each do |scm_account| -%>
- <li class="text-ellipsis" title="<%= scm_account -%>"><%= scm_account -%></li>
- <% end -%>
- </ul>
- </div>
-
- <% if User.editable_password? %>
- <div class="big-spacer-top text-center">
- <button id="account-change-password-trigger">
- <i class="icon-lock"></i> <%= message('my_profile.password.title') -%>
- </button>
- </div>
- <% end %>
- </div>
- </div>
-
- <div class="overflow-hidden">
- <% unless current_user.favourites.empty? -%>
- <section class="big-spacer-bottom">
- <%= render "account/favorites" -%>
- </section>
- <% end %>
-
- <form id="notif_form" method="post" action="<%= ApplicationController.root_context -%>/account/update_notifications">
- <% unless @global_dispatchers.empty? -%>
- <section class="big-spacer-bottom">
- <%= render "account/global_notifications" -%>
- </section>
- <% end %>
-
- <% unless @per_project_dispatchers.empty? -%>
- <section>
- <%= render "account/per_project_notifications" -%>
- </section>
- <% end %>
-
- <section class="big-spacer-top">
- <input type="submit" value="<%= message('my_profile.notifications.submit') -%>" name="commit">
- </section>
- </form>
-
- <section id="account-tokens" class="huge-spacer-top spacer-bottom"></section>
- </div>
-</div>
-
-<% content_for :extra_script do %>
- <script src="<%= ApplicationController.root_context -%>/js/bundles/account.js?v=<%= sonar_version -%>"></script>
-<% end %>
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/lib/need_authentication.rb b/server/sonar-web/src/main/webapp/WEB-INF/lib/need_authentication.rb
index 48b791a2824..3d25c117168 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/lib/need_authentication.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/lib/need_authentication.rb
@@ -34,10 +34,6 @@ class DefaultRealm
end
result
end
-
- def editable_password?
- true
- end
end
#
@@ -213,10 +209,6 @@ class PluginRealm
end
end
end
-
- def editable_password?
- false
- end
end
#
@@ -267,10 +259,6 @@ module NeedAuthentication
RealmFactory.realm.authenticate?(login, password, servlet_request) if RealmFactory.realm
end
-
- def editable_password?
- RealmFactory.realm && RealmFactory.realm.editable_password?
- end
end
end
end