diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-09-05 10:31:06 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-09-05 10:31:06 +0000 |
| commit | f7acdd1afde3018a9f7c0a7dc3b6bd97a65670a2 (patch) | |
| tree | ba4070526883885914942b3a0d253eb2a6e63bf8 /app | |
| parent | 4b9df2eac774aa045aa5207c8bc613ed6ca67d42 (diff) | |
| download | redmine-f7acdd1afde3018a9f7c0a7dc3b6bd97a65670a2.tar.gz redmine-f7acdd1afde3018a9f7c0a7dc3b6bd97a65670a2.zip | |
Merged hooks branch @ r1785 into trunk.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1786 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/issues_controller.rb | 1 | ||||
| -rw-r--r-- | app/helpers/issues_helper.rb | 3 | ||||
| -rw-r--r-- | app/views/issues/_form.rhtml | 2 | ||||
| -rw-r--r-- | app/views/issues/bulk_edit.rhtml | 1 | ||||
| -rw-r--r-- | app/views/issues/show.rhtml | 1 | ||||
| -rw-r--r-- | app/views/layouts/base.rhtml | 7 | ||||
| -rw-r--r-- | app/views/projects/settings/_members.rhtml | 2 | ||||
| -rw-r--r-- | app/views/versions/show.rhtml | 2 |
8 files changed, 15 insertions, 4 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 3f7723226..7d572924f 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -233,6 +233,7 @@ class IssuesController < ApplicationController issue.start_date = params[:start_date] unless params[:start_date].blank? issue.due_date = params[:due_date] unless params[:due_date].blank? issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank? + call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue }) # Don't save any change to the issue if the user is not authorized to apply the requested status if (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save # Send notification for each issue (if changed) diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index c6de00c10..43acabd19 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -89,7 +89,8 @@ module IssuesHelper when 'attachment' label = l(:label_attachment) end - + call_hook(:helper_issues_show_detail_after_setting, {:detail => detail, :label => label, :value => value, :old_value => old_value }) + label ||= detail.prop_key value ||= detail.value old_value ||= detail.old_value diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml index 4eca3cb4a..419536fee 100644 --- a/app/views/issues/_form.rhtml +++ b/app/views/issues/_form.rhtml @@ -48,4 +48,6 @@ <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p> <% end %> +<%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %> + <%= wikitoolbar_for 'issue_description' %> diff --git a/app/views/issues/bulk_edit.rhtml b/app/views/issues/bulk_edit.rhtml index 86bc76765..b916cf092 100644 --- a/app/views/issues/bulk_edit.rhtml +++ b/app/views/issues/bulk_edit.rhtml @@ -38,6 +38,7 @@ <label><%= l(:field_done_ratio) %>: <%= select_tag 'done_ratio', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></label> </p> +<%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %> </fieldset> <fieldset><legend><%= l(:field_notes) %></legend> diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index 2dd1bacaa..463fa6960 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -53,6 +53,7 @@ <%end end %> </tr> +<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %> </table> <hr /> diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index 62d542b7b..8c1c01903 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -6,7 +6,7 @@ <meta name="description" content="<%= Redmine::Info.app_name %>" /> <meta name="keywords" content="issue,bug,tracker" /> <%= stylesheet_link_tag 'application', :media => 'all' %> -<%= javascript_include_tag :defaults %> +<%= javascript_include_tag :defaults, :cache => true %> <%= stylesheet_link_tag 'jstoolbar' %> <!--[if IE]> <style type="text/css"> @@ -14,8 +14,9 @@ body {behavior: url(<%= stylesheet_path "csshover.htc" %>);} </style> <![endif]--> - -<!-- page specific tags --><%= yield :header_tags %> +<%= call_hook :view_layouts_base_html_head %> +<!-- page specific tags --> +<%= yield :header_tags -%> </head> <body> <div id="wrapper"> diff --git a/app/views/projects/settings/_members.rhtml b/app/views/projects/settings/_members.rhtml index ab22ac602..9fdd3e5b4 100644 --- a/app/views/projects/settings/_members.rhtml +++ b/app/views/projects/settings/_members.rhtml @@ -10,6 +10,7 @@ <th><%= l(:label_user) %></th> <th><%= l(:label_role) %></th> <th style="width:15%"></th> + <%= call_hook(:view_projects_settings_members_table_header) %> </thead> <tbody> <% members.each do |member| %> @@ -30,6 +31,7 @@ }, :title => l(:button_delete), :class => 'icon icon-del' %> </td> + <%= call_hook(:view_projects_settings_members_table_row, :member => @member) %> </tr> </tbody> <% end; reset_cycle %> diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml index 7f9518af8..7e5264562 100644 --- a/app/views/versions/show.rhtml +++ b/app/views/versions/show.rhtml @@ -45,4 +45,6 @@ <% end %> </div> +<%= call_hook :view_versions_show_bottom, :version => @version %> + <% html_title @version.name %> |