* Changed Project#activities to allow getting inactive Activities also: * Changed the Enumeration#all named_scope to exclude project specific Activities * Changed the Project has_many time_entry_activities to include all by default and provided an #active method to filter them to active ones only * Split Project#activities to two methods and gave it a parameter that is used to determine if inactive activities are included (default is no) * Added a reset button to delete all project specific activities. * Added ProjectsController#reset_activities to remove the project specific activities * Added a HTTP DELETE route for reset_activities * Changed the permissions for managing project activities to have access to the ProjectsController#reset_activities action * Added a way to bulk save Project specific Activities in ProjectsController * #save_activities will save all the changed activities, including update the existing records * Added helper methods to the controller which will be refactored later * Allow the same TimeEntryActivity names on different projects #4077 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2949 e93f8b46-1217-0410-a6f0-8f06a7374b81pull/351/head
parent
e615266e9a
commit
5833ba9f81
@ -0,0 +1,37 @@ |
||||
<% form_tag({:controller => 'projects', :action => 'save_activities', :id => @project}, :class => "tabular") do %> |
||||
|
||||
<table class="list"> |
||||
<tr> |
||||
<th><%= l(:field_name) %></th> |
||||
<th><%= l(:enumeration_system_activity) %></th> |
||||
<% TimeEntryActivity.new.available_custom_fields.each do |value| %> |
||||
<th><%= h value.name %></th> |
||||
<% end %> |
||||
<th style="width:15%;"><%= l(:field_active) %></th> |
||||
</tr> |
||||
|
||||
<% @project.activities(true).each do |enumeration| %> |
||||
<% fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %> |
||||
<tr class="<%= cycle('odd', 'even') %>"> |
||||
<td> |
||||
<%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %> |
||||
<%= h(enumeration) %> |
||||
</td> |
||||
<td align="center" style="width:15%;"><%= image_tag('true.png') unless enumeration.project %></td> |
||||
<% enumeration.custom_field_values.each do |value| %> |
||||
<td align="center"> |
||||
<%= custom_field_tag "enumerations[#{enumeration.id}]", value %> |
||||
</td> |
||||
<% end %> |
||||
<td align="center" style="width:15%;"> |
||||
<%= ff.check_box :active %> |
||||
</td> |
||||
</tr> |
||||
<% end %> |
||||
<% end %> |
||||
</table> |
||||
|
||||
<%= submit_tag l(:button_save) %> |
||||
<% end %> |
||||
<%= button_to l(:button_reset), {:controller => 'projects', :action => 'reset_activities', :id => @project}, :method => :delete, :confirm => l(:text_are_you_sure), :style => "position: relative; top: -20px; left: 60px;" %> |
||||
|
Loading…
Reference in new issue