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