Download as
Browse Code »

Commit 3a92026daf9daf5dfa5965aa40518bf3306a9f49

Authored by Alessandro Palmeira + Carlos Morais
Committed by Carlos Morais
1 parent 311e9dd2
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

[Mezuro] Added project states partials

Showing 3 changed files with 16 additions and 14 deletions   Show diff stats
plugins/mezuro/views/content_viewer/_project_error.rhtml 0 → 100644
  Diff comments   View file @3a92026
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
  1 +<h3><%= _('ERROR') %></h3>
  2 +<p>
  3 + <%= "State when error ocurred: #{project.state}" %>
  4 + <br/>
  5 + <% error = project.error %>
  6 + <%= error.message %>
  7 +<ul>
  8 + <% error.stack_trace.each do |trace| %>
  9 + <li><%= "#{trace.declaring_class}.#{trace.method_name}(#{trace.file_name}:#{trace.line_number})" %></li>
  10 + <% end %>
  11 +</ul>
  12 +</p>
plugins/mezuro/views/content_viewer/_project_processing.rhtml 0 → 100644
  Diff comments   View file @3a92026
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +<h3><%= _('Service is ') + project.state.downcase + ' ' + project.name + '...' %></h3>
0 \ No newline at end of file 2 \ No newline at end of file
plugins/mezuro/views/content_viewer/show_project.rhtml
  Diff comments   View file @3a92026
@@ -30,20 +30,9 @@ @@ -30,20 +30,9 @@
30 <br /> 30 <br />
31 31
32 <% if ! @project.error.nil? %> 32 <% if ! @project.error.nil? %>
33 - <h3><%= _('ERROR') %></h3>  
34 - <p>  
35 - <%= "State when error ocurred: #{@project.state}" %>  
36 - <br/>  
37 - <% error = @project.error %>  
38 - <%= error.message %>  
39 - <ul>  
40 - <% error.stack_trace.each do |trace| %>  
41 - <li><%= "#{trace.declaring_class}.#{trace.method_name}(#{trace.file_name}:#{trace.line_number})" %></li>  
42 - <% end %>  
43 - </ul>  
44 - </p>  
45 -<% elsif @project.state.end_with?('ING') %>  
46 - <h3><%= _('Service is ') + @project.state.downcase + ' ' + @project.name + '...' %></h3> 33 + <%= render :partial => 'content_viewer/project_error', :locals => { :project => @project } %>
  34 +<% elsif @project.state.end_with?('ING') #Loading or analyzing%>
  35 + <%= render :partial => 'content_viewer/project_processing', :locals => { :project => @project } %>
47 <% elsif @project.state == 'READY' %> 36 <% elsif @project.state == 'READY' %>
48 <%= render :partial => 'content_viewer/project_result', :locals => { :project_result => @page.project_result } %> 37 <%= render :partial => 'content_viewer/project_result', :locals => { :project_result => @page.project_result } %>
49 <% end %> 38 <% end %>