diff options
| author | Fabrice Bellingard <bellingard@gmail.com> | 2012-01-30 18:52:50 +0100 |
|---|---|---|
| committer | Fabrice Bellingard <bellingard@gmail.com> | 2012-01-30 18:53:38 +0100 |
| commit | 739d0057a3b9c066801eb6ea9f397be4b529595d (patch) | |
| tree | 60f41baadba16dbcf40aa25d74b78232a85ac7ee | |
| parent | 0ed45530370c950a14069a97194c7d5a0b57220d (diff) | |
| download | sonarqube-739d0057a3b9c066801eb6ea9f397be4b529595d.tar.gz sonarqube-739d0057a3b9c066801eb6ea9f397be4b529595d.zip | |
SONAR-3104 Fix bug and improve element IDs to ease ITs
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb | 8 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb | 19 |
2 files changed, 15 insertions, 12 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb index a7f5dfe62f4..04107d49e17 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/project_controller.rb @@ -259,12 +259,12 @@ class ProjectController < ApplicationController flash[:error] = message('project_history.event_already_exists', :params => params[:event_name]) else snapshots = find_project_snapshots(snapshot.id) - snapshots.each do |snapshot| + snapshots.each do |s| e = Event.new({:name => params[:event_name], :category => EventCategory::KEY_OTHER, - :snapshot => snapshot, - :resource_id => snapshot.project_id, - :event_date => snapshot.created_at}) + :snapshot => s, + :resource_id => s.project_id, + :event_date => s.created_at}) e.save! end flash[:notice] = message('project_history.event_created', :params => params[:event_name]) diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb index 29a5de3a74c..30a4093d662 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project/history.html.erb @@ -82,23 +82,26 @@ <td class="thin nowrap" style="padding-left: 20px;"> <table class="max-width"> - <% other_events.each do |event| %> - <tr id="event_<%= event.id -%>"> + <% + other_events.each_with_index do |event, index2| + event_index = index.to_s + '-' + index2.to_s + %> + <tr id="event_<%= event_index -%>"> <td class="max-width"><%= event.name -%></td> <td class="small edit_actions" style="padding-left:20px"> - <a id="event_<%= event.id -%>_change" href="#" onclick="$('event_<%= event.id -%>').hide();$('event_<%= event.id -%>_form').show();$('event_name_<%= event.id -%>').focus();return false;"><%= message('project_history.edit_event') -%></a> + <a id="event_<%= event_index -%>_change" href="#" onclick="$('event_<%= event_index -%>').hide();$('event_<%= event_index -%>_form').show();$('event_name_<%= event_index -%>').focus();return false;"><%= message('project_history.edit_event') -%></a> <%= link_to( message('project_history.remove_version'), { :action => 'delete_event', :id => event.id}, :confirm => message('project_history.do_you_want_to_remove_version', :params => event.name) ) -%> </td> </tr> - <tr id="event_<%= event.id -%>_form" style="display:none;"> + <tr id="event_<%= event_index -%>_form" style="display:none;"> <td colspan="2" class="admin"> <% form_tag( {:action => 'update_event', :id => event.id }) do -%> - <input id="event_name_<%= event.id -%>" name="event_name" type="text" value="<%= event.name -%>" - onKeyUp="if (this.value=='') $('save_event_<%= event.id -%>').disabled='true'; else $('save_event_<%= event.id -%>').disabled='';"/> - <%= submit_tag message('save'), :id => 'save_event_' + event.id.to_s %> - <a href="#" onclick="$('event_<%= event.id -%>').show();$('event_<%= event.id -%>_form').hide();"><%= message('cancel') -%></a> + <input id="event_name_<%= event_index -%>" name="event_name" type="text" value="<%= event.name -%>" + onKeyUp="if (this.value=='') $('save_event_<%= event_index -%>').disabled='true'; else $('save_event_<%= event_index -%>').disabled='';"/> + <%= submit_tag message('save'), :id => 'save_event_' + event_index %> + <a href="#" onclick="$('event_<%= event_index -%>').show();$('event_<%= event_index -%>_form').hide();"><%= message('cancel') -%></a> <% end %> </td> </tr> |