##// END OF EJS Templates
Merged r2610, r2611 from trunk....
Jean-Philippe Lang -
r2565:16810acf015a
parent child
Show More
@@ -46,6 +46,7 class CustomFieldsController < ApplicationController
46 46 end
47 47 if request.post? and @custom_field.save
48 48 flash[:notice] = l(:notice_successful_create)
49 call_hook(:controller_custom_fields_new_after_save, :params => params, :custom_field => @custom_field)
49 50 redirect_to :action => 'list', :tab => @custom_field.class.name
50 51 end
51 52 @trackers = Tracker.find(:all, :order => 'position')
@@ -58,6 +59,7 class CustomFieldsController < ApplicationController
58 59 @custom_field.trackers = params[:tracker_ids] ? Tracker.find(params[:tracker_ids]) : []
59 60 end
60 61 flash[:notice] = l(:notice_successful_update)
62 call_hook(:controller_custom_fields_edit_after_save, :params => params, :custom_field => @custom_field)
61 63 redirect_to :action => 'list', :tab => @custom_field.class.name
62 64 end
63 65 @trackers = Tracker.find(:all, :order => 'position')
@@ -82,6 +82,7 function deleteValueField(e) {
82 82 <% end %>
83 83 </p>
84 84 <p><%= @custom_field.field_format == 'bool' ? f.check_box(:default_value) : f.text_field(:default_value) %></p>
85 <%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
85 86 </div>
86 87
87 88 <div class="box">
@@ -109,5 +110,6 when "IssueCustomField" %>
109 110 <p><%= f.check_box :is_required %></p>
110 111
111 112 <% end %>
113 <%= call_hook(:"view_custom_fields_form_#{@custom_field.type.to_s.underscore}", :custom_field => @custom_field, :form => f) %>
112 114 </div>
113 115 <%= javascript_tag "toggle_custom_field_format();" %>
@@ -11,5 +11,7
11 11 <p><label for="issue_status_is_default"><%=l(:field_is_default)%></label>
12 12 <%= check_box 'issue_status', 'is_default' %></p>
13 13
14 <%= call_hook(:view_issue_statuses_form, :issue_status => @issue_status) %>
15
14 16 <!--[eoform:issue_status]-->
15 </div> No newline at end of file
17 </div>
@@ -1,4 +1,6
1 1 <ul>
2 <%= call_hook(:view_issues_context_menu_start, {:issues => @issues, :can => @can, :back => @back }) %>
3
2 4 <% if !@issue.nil? -%>
3 5 <li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue},
4 6 :class => 'icon-edit', :disabled => !@can[:edit] %></li>
@@ -87,4 +89,6
87 89 :class => 'icon-move', :disabled => !@can[:move] %></li>
88 90 <li><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :ids => @issues.collect(&:id)},
89 91 :method => :post, :confirm => l(:text_issues_destroy_confirmation), :class => 'icon-del', :disabled => !@can[:delete] %></li>
92
93 <%= call_hook(:view_issues_context_menu_end, {:issues => @issues, :can => @can, :back => @back }) %>
90 94 </ul>
@@ -69,6 +69,8 end %>
69 69
70 70 <%= link_to_attachments @issue %>
71 71
72 <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
73
72 74 <% if authorize_for('issue_relations', 'new') || @issue.relations.any? %>
73 75 <hr />
74 76 <div id="relations">
@@ -15,6 +15,7
15 15 <p><%= f.text_field :lastname, :required => true %></p>
16 16 <p><%= f.text_field :mail, :required => true %></p>
17 17 <p><%= f.select :language, lang_options_for_select %></p>
18 <%= call_hook(:view_my_account, :user => @user, :form => f) %>
18 19 </div>
19 20
20 21 <%= submit_tag l(:button_save) %>
@@ -13,6 +13,7
13 13 <% end %>
14 14
15 15 <p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
16 <%= call_hook(:view_users_form, :user => @user, :form => f) %>
16 17 </div>
17 18
18 19 <div class="box">
General Comments 0
You need to be logged in to leave comments. Login now