Commit 8f41190ea335e83dc56f3a14bef150dc83ec03b6
Committed by
Paulo Meireles
1 parent
230c1aa5
Exists in
master
and in
29 other branches
[Mezuro] Partial is now rendered at the right place. Also, partial is in repository.
Showing
4 changed files
with
8 additions
and
10 deletions
Show diff stats
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
... | ... | @@ -126,9 +126,6 @@ class MezuroPluginProfileController < ProfileController |
126 | 126 | |
127 | 127 | def module_metrics_history |
128 | 128 | metric_name = params[:metric_name] |
129 | - for i in 1..50 do | |
130 | - puts metric_name | |
131 | - end | |
132 | 129 | content = profile.articles.find(params[:id]) |
133 | 130 | module_history = content.result_history(params[:module_name]) |
134 | 131 | metric_history = module_history.collect { |x| (x.metric_results.select { |y| y.metric.name == metric_name })[0] } | ... | ... |
plugins/mezuro/public/javascripts/project_content.js
1 | 1 | var processingTree = false; |
2 | +var metricName; | |
2 | 3 | jQuery(function (){ |
3 | 4 | jQuery('.source-tree-link').live("click", reloadModule); |
4 | 5 | jQuery('[data-show]').live("click", toggle_mezuro); |
5 | - //alert('AAAASDFAGSGDRSAFGHADFGSDFGSD'); | |
6 | 6 | jQuery('[show-metric-history]').live("click", display_metric_history); |
7 | 7 | showLoadingProcess(true); |
8 | 8 | showProjectContent(); |
... | ... | @@ -15,14 +15,13 @@ function showProjectContent() { |
15 | 15 | function display_metric_history() { |
16 | 16 | var module_name = jQuery(this).attr('data-module-name'); |
17 | 17 | var metric_name = jQuery(this).attr('data-metric-name'); |
18 | - alert (metric_name); | |
19 | - callAction('module_metrics_history', {module_name: module_name, metric_name: metric_name}, show_metrics)//metric_name, module_name}, show_metrics); | |
18 | + metricName = metric_name; | |
19 | + callAction('module_metrics_history', {module_name: module_name, metric_name: metric_name}, show_metrics); | |
20 | + return false; | |
20 | 21 | } |
21 | 22 | |
22 | 23 | function show_metrics(content) { |
23 | - alert('SSSSSSSSSSS'); | |
24 | - jQuery('#historical').html(content); | |
25 | - | |
24 | + jQuery('#historical-' + metricName).html(content); | |
26 | 25 | } |
27 | 26 | |
28 | 27 | function toggle_mezuro(){ | ... | ... |
plugins/mezuro/views/content_viewer/_metric_history.rhtml
0 → 100644
plugins/mezuro/views/content_viewer/_module_result.rhtml
... | ... | @@ -32,7 +32,7 @@ |
32 | 32 | <%= range.nil? or range.comments.nil? ? 'comment empty' : range.comments %> |
33 | 33 | </td> |
34 | 34 | <td> |
35 | - <div id='historical'> | |
35 | + <div id='historical-<%= metric_result.metric.name.delete("() ") %>'> | |
36 | 36 | <a href="#" show-metric-history="<%= metric_result.metric.name.delete("() ") %>" data-module-name="<%= the_module.name %>" data-metric-name="<%= metric_result.metric.name.delete("() ") %>"> <p style="text-indent: 3em;"> Draw Historical Graphic </p> </a> |
37 | 37 | </div> |
38 | 38 | </td> | ... | ... |