Download as
Browse Code »

Commit 721d793b008a39aa170cda7aa7a3657df7467490

Authored by Paulo Meireles
Committed by Diego Camarinha
1 parent 4249a644
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

[Mezuro] FIXME: autoload project results

Showing 3 changed files with 27 additions and 20 deletions   Show diff stats
plugins/mezuro/public/javascripts/autoreload.js
  Diff comments   View file @721d793
1   -function autoreloads($) {
2   - $('#autoreload').onload(show_autoreload);
3   -}
4   -
5   -function show_autoreload(){
6   - var profile = jQuery('#autoreload').attr('data-profile');
7   - var project = jQuery('#autoreload').attr('data-project-id');
8   - var project_name = jQuery('#autoreload').attr('data-project-name');
  1 +function show_autoreload($){
  2 + var profile = $('#autoreload').attr('data-profile');
  3 + var project = $('#autoreload').attr('data-project-id');
  4 + var project_state = $('#autoreload').attr('data-project-state');
  5 + var project_name = $('#autoreload').attr('data-project-name');
9 6 var endpoint = '/profile/' + profile + '/plugins/mezuro/autoreload/' + project;
  7 +
10 8 show_loading_message(project_name);
11   - jQuery.get(endpoint, {project_name: project_name}, show_page_with_results);
  9 + $.get(endpoint, {project_name: project_name}, show_page_with_results);
12 10 return false;
13 11 }
14 12  
... ...
plugins/mezuro/views/content_viewer/_autoreload.rhtml
  Diff comments   View file @721d793
  1 +<% if project_content.project.state == 'READY' %>
  2 +
1 3 <h3><%= _('LAST RESULT') %></h3>
2   - <% @project_result = @page.project_result %>
  4 + <% @project_result = project_content.project_result %>
3 5  
4 6 <table id="project_result_info">
5 7 <tr>
... ... @@ -20,10 +22,16 @@
20 22  
21 23 <%= render :partial => 'source_tree', :locals => { :source_tree => @project_result.source_tree } %>
22 24  
23   - <div id='module-result' data-profile="<%= @page.profile.identifier %>" data-project-id='<%= @page.id %>'>
24   - <%= render :partial => 'module_result', :locals => { :module_result => @page.module_result(@project.name) } %>
  25 + <div id='module-result' data-profile="<%= project_content.profile.identifier %>" data-project-id='<%= project_content.id %>'>
  26 + <%= render :partial => 'module_result', :locals => { :module_result => project_content.module_result(project_content.project.name) } %>
25 27 </div>
26 28  
27 29 <script type="text/javascript">
28 30 jQuery(results);
29 31 </script>
  32 +
  33 +<% else %>
  34 +
  35 + Joao Silva estah dormindo ...
  36 +
  37 +<% end %>.
... ...
plugins/mezuro/views/content_viewer/show_project.rhtml
  Diff comments   View file @721d793
1   -<% @project = @page.project %>
  1 +<% @project_content = @page
  2 + @project = @project_content.project %>
2 3  
3 4 <table id="project_info">
4 5 <tr>
... ... @@ -40,14 +41,14 @@
40 41 <li><%= "#{trace.declaring_class}.#{trace.method_name}(#{trace.file_name}:#{trace.line_number})" %></li>
41 42 <% end %></ul>
42 43 </p>
43   -<% elsif @page.project.state=='READY' %>
44   - <div id='autoreload' data-profile="<%= @page.profile.identifier %>" data-project-id='<%= @page.id %>' data-project-name='<%= @project.name %>'>
45   - <%= render :partial => 'autoreload', :locals => { :autoreload => @page } %>
46   - </div>
47 44 <% else %>
48   - <div id='autoreload' data-profile="<%= @page.profile.identifier %>" data-project-id='<%= @page.id %>' data-project-name="<%= @project.name %>">
49   - </div>
  45 +
  46 + <div id='autoreload' data-profile="<%= @project_content.profile.identifier %>" data-project-id='<%= @project_content.id %>' data-project-name='<%= @project.name %>' data-project-state='<%= @project.state %>'>
  47 + <%= render :partial => 'autoreload', :locals => { :project_content => @project_content } %>
  48 + </div>
  49 +
50 50 <script type="text/javascript">
51   - jQuery(autoreloads);
  51 + jQuery(show_autoreload);
52 52 </script>
  53 +
53 54 <% end %>
... ...