diff options
author | Stas Vilchik <vilchiks@gmail.com> | 2014-09-24 12:27:41 +0600 |
---|---|---|
committer | Stas Vilchik <vilchiks@gmail.com> | 2014-09-24 12:27:48 +0600 |
commit | ad23fc889606b8d9e5c08ed5c165928e876f6384 (patch) | |
tree | 1dcfa971ba575e52e0e8be9d5860969226cbdf88 /server/sonar-web/src/main/webapp | |
parent | 1540fa46087dd1b5d26bc660a1989834b7def20f (diff) | |
download | sonarqube-ad23fc889606b8d9e5c08ed5c165928e876f6384.tar.gz sonarqube-ad23fc889606b8d9e5c08ed5c165928e876f6384.zip |
SONAR-5646 Support of project-level widgets
Diffstat (limited to 'server/sonar-web/src/main/webapp')
-rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/index.html.erb | 3 | ||||
-rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/index.html.erb index 8dd759d6cf1..57b4def8b11 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/index.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard2/index.html.erb @@ -8,5 +8,8 @@ <script> window.did = '<%= @dashboard.id -%>'; + <% if @resource %> + window.resource = '<%= @resource.key -%>'; + <% end %> jQuery('html').addClass('dashboard-page'); </script> diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb index 3dae12f9a0e..91ecee1c111 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb @@ -1,5 +1,4 @@ <div id="measure_filter_list<%= widget_id -%>"> -<% content_for :script do %> <script> var filterCriteria<%= widget_id -%> = <%= json_escape(filter.criteria.to_json) -%>; @@ -20,9 +19,8 @@ return false; } </script> -<% - end + <% display_favourites = logged_in? colspan = filter.display.columns.size colspan += 1 if display_favourites |