From 721d793b008a39aa170cda7aa7a3657df7467490 Mon Sep 17 00:00:00 2001 From: Paulo Meirelles + Diego Araújo Date: Wed, 15 Feb 2012 16:56:39 +0300 Subject: [PATCH] [Mezuro] FIXME: autoload project results --- plugins/mezuro/public/javascripts/autoreload.js | 16 +++++++--------- plugins/mezuro/views/content_viewer/_autoreload.rhtml | 14 +++++++++++--- plugins/mezuro/views/content_viewer/show_project.rhtml | 17 +++++++++-------- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/plugins/mezuro/public/javascripts/autoreload.js b/plugins/mezuro/public/javascripts/autoreload.js index a3734b4..f590849 100644 --- a/plugins/mezuro/public/javascripts/autoreload.js +++ b/plugins/mezuro/public/javascripts/autoreload.js @@ -1,14 +1,12 @@ -function autoreloads($) { - $('#autoreload').onload(show_autoreload); -} - -function show_autoreload(){ - var profile = jQuery('#autoreload').attr('data-profile'); - var project = jQuery('#autoreload').attr('data-project-id'); - var project_name = jQuery('#autoreload').attr('data-project-name'); +function show_autoreload($){ + var profile = $('#autoreload').attr('data-profile'); + var project = $('#autoreload').attr('data-project-id'); + var project_state = $('#autoreload').attr('data-project-state'); + var project_name = $('#autoreload').attr('data-project-name'); var endpoint = '/profile/' + profile + '/plugins/mezuro/autoreload/' + project; + show_loading_message(project_name); - jQuery.get(endpoint, {project_name: project_name}, show_page_with_results); + $.get(endpoint, {project_name: project_name}, show_page_with_results); return false; } diff --git a/plugins/mezuro/views/content_viewer/_autoreload.rhtml b/plugins/mezuro/views/content_viewer/_autoreload.rhtml index 53acb6a..555d434 100644 --- a/plugins/mezuro/views/content_viewer/_autoreload.rhtml +++ b/plugins/mezuro/views/content_viewer/_autoreload.rhtml @@ -1,5 +1,7 @@ +<% if project_content.project.state == 'READY' %> +

<%= _('LAST RESULT') %>

- <% @project_result = @page.project_result %> + <% @project_result = project_content.project_result %> @@ -20,10 +22,16 @@ <%= render :partial => 'source_tree', :locals => { :source_tree => @project_result.source_tree } %> -
- <%= render :partial => 'module_result', :locals => { :module_result => @page.module_result(@project.name) } %> +
+ <%= render :partial => 'module_result', :locals => { :module_result => project_content.module_result(project_content.project.name) } %>
+ +<% else %> + + Joao Silva estah dormindo ... + +<% end %>. diff --git a/plugins/mezuro/views/content_viewer/show_project.rhtml b/plugins/mezuro/views/content_viewer/show_project.rhtml index b861f66..2133d07 100644 --- a/plugins/mezuro/views/content_viewer/show_project.rhtml +++ b/plugins/mezuro/views/content_viewer/show_project.rhtml @@ -1,4 +1,5 @@ -<% @project = @page.project %> +<% @project_content = @page + @project = @project_content.project %>
@@ -40,14 +41,14 @@
  • <%= "#{trace.declaring_class}.#{trace.method_name}(#{trace.file_name}:#{trace.line_number})" %>
  • <% end %>

    -<% elsif @page.project.state=='READY' %> -
    - <%= render :partial => 'autoreload', :locals => { :autoreload => @page } %> -
    <% else %> -
    -
    + +
    + <%= render :partial => 'autoreload', :locals => { :project_content => @project_content } %> +
    + + <% end %> -- libgit2 0.21.2