diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-07-17 09:22:42 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-07-17 09:22:42 +0000 |
| commit | 1db54e228d98d20536133bf52a8af0ce67616dc3 (patch) | |
| tree | 31bfae0406bc57a74e6a10dffbe4abb90d6a7b6d /app/views/repositories | |
| parent | f165bbd0d7196f7f74a7e5ceb66f2726a9781ba7 (diff) | |
| download | redmine-1db54e228d98d20536133bf52a8af0ce67616dc3.tar.gz redmine-1db54e228d98d20536133bf52a8af0ce67616dc3.zip | |
Don't respond with the error template when annotate is not available.
git-svn-id: http://svn.redmine.org/redmine/trunk@15694 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/repositories')
| -rw-r--r-- | app/views/repositories/annotate.html.erb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/repositories/annotate.html.erb b/app/views/repositories/annotate.html.erb index fcb6d3d84..79a548f7e 100644 --- a/app/views/repositories/annotate.html.erb +++ b/app/views/repositories/annotate.html.erb @@ -8,8 +8,8 @@ <%= render :partial => 'link_to_functions' %> +<% if @annotate %> <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %> - <div class="autoscroll"> <table class="filecontent annotate syntaxhl"> <tbody> @@ -38,6 +38,9 @@ </tbody> </table> </div> +<% else %> +<p id="errorExplanation"><%= @error_message %></p> +<% end %> <% html_title(l(:button_annotate)) -%> |