-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from AllTaken/Redmine_3.0.1
Update to Redmine 3.0.1 + Misc
- Loading branch information
Showing
17 changed files
with
884 additions
and
1,207 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,24 @@ | ||
| <% reply_links = authorize_for('issues', 'edit') -%> | ||
| <% for journal in journals %> | ||
| <% if details_to_strings(journal.details).any? || journal.notes.blank? == false %> | ||
| <div id="change-<%= journal.id %>" class="<%= journal.css_classes %>"> | ||
| <div id="note-<%= journal.indice %>"> | ||
| <h4><a href="#note-<%= journal.indice %>" class="journal-link">#<%= journal.indice %></a> | ||
| <%= avatar(journal.user, :size => "24") %> | ||
| <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %> | ||
| <%= content_tag('span', l(:field_is_private), :class => 'private') if journal.private_notes? %></h4> | ||
|
|
||
| <% if details_to_strings(journal.details).any? || journal.notes.blank? == false %> | ||
|
|
||
| <div id="change-<%= journal.id %>" class="<%= journal.css_classes %>"> | ||
| <div id="note-<%= journal.indice %>"> | ||
| <h4><%= link_to "##{journal.indice}", {:anchor => "note-#{journal.indice}"}, :class => "journal-link" %> | ||
| <%= avatar(journal.user, :size => "24") %> | ||
| <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></h4> | ||
|
|
||
| <% if journal.details.any? %> | ||
| <ul class="details"> | ||
| <% details_to_strings(journal.visible_details).each do |string| %> | ||
| <li><%= string %></li> | ||
| <% end %> | ||
| </ul> | ||
| <% end %> | ||
| <%= render_notes(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %> | ||
| </div> | ||
| </div> | ||
| <%= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %> | ||
| <% if journal.details.any? %> | ||
| <ul class="details"> | ||
| <% details_to_strings(journal.visible_details).each do |string| %> | ||
| <li><%= string %></li> | ||
| <% end %> | ||
| </ul> | ||
| <% end %> | ||
| <%= render_notes(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %> | ||
| </div> | ||
| </div> | ||
| <%= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %> | ||
| <% end %> | ||
| <% end %> | ||
|
|
||
| <% end %> | ||
|
|
||
| <% heads_for_wiki_formatter if User.current.allowed_to?(:edit_issue_notes, issue.project) || User.current.allowed_to?(:edit_own_issue_notes, issue.project) %> | ||
| <% heads_for_wiki_formatter if User.current.allowed_to?(:edit_issue_notes, issue.project) || User.current.allowed_to?(:edit_own_issue_notes, issue.project) %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| <%= error_messages_for 'query' %> | ||
|
|
||
| <div class="box"> | ||
| <div class="tabular"> | ||
| <%= hidden_field_tag 'gantt', '1' if params[:gantt] %> | ||
|
|
||
| <p><label for="query_name"><%=l(:field_name)%></label> | ||
| <%= text_field 'query', 'name', :size => 80 %></p> | ||
|
|
||
| <% if User.current.admin? || User.current.allowed_to?(:manage_public_queries, @project) %> | ||
| <p><label><%=l(:field_visible)%></label> | ||
| <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_PRIVATE %> <%= l(:label_visibility_private) %></label> | ||
| <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_ROLES %> <%= l(:label_visibility_roles) %>:</label> | ||
| <% Role.givable.sorted.each do |role| %> | ||
| <label class="block role-visibility"><%= check_box_tag 'query[role_ids][]', role.id, @query.roles.include?(role), :id => nil %> <%= role.name %></label> | ||
| <% end %> | ||
| <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_PUBLIC %> <%= l(:label_visibility_public) %></label> | ||
| <%= hidden_field_tag 'query[role_ids][]', '' %> | ||
| </p> | ||
| <% end %> | ||
|
|
||
| <p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label> | ||
| <%= check_box_tag 'query_is_for_all', 1, @query.project.nil?, | ||
| :disabled => (!@query.new_record? && (@query.project.nil? || (@query.is_public? && !User.current.admin?))) %></p> | ||
|
|
||
| <% unless params[:gantt] %> | ||
| <fieldset><legend><%= l(:label_options) %></legend> | ||
| <p><label for="query_default_columns"><%=l(:label_default_columns)%></label> | ||
| <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns', | ||
| :onclick => 'if (this.checked) {$("#columns").hide();} else {$("#columns").show();}' %></p> | ||
|
|
||
| <p><label for="query_group_by"><%= l(:field_group_by) %></label> | ||
| <%= select 'query', 'group_by', @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, :include_blank => true %></p> | ||
|
|
||
| <p><label><%= l(:button_show) %></label> | ||
| <%= available_block_columns_tags(@query) %></p> | ||
| </fieldset> | ||
| <% else %> | ||
| <fieldset><legend><%= l(:label_options) %></legend> | ||
| <p><label><%= l(:button_show) %></label> | ||
| <label class="inline"><%= check_box_tag "query[draw_relations]", "1", @query.draw_relations %> <%= l(:label_related_issues) %></label> | ||
| <label class="inline"><%= check_box_tag "query[draw_progress_line]", "1", @query.draw_progress_line %> <%= l(:label_gantt_progress_line) %></label> | ||
| </p> | ||
| </fieldset> | ||
| <% end %> | ||
| </div> | ||
|
|
||
| <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend> | ||
| <%= render :partial => 'queries/filters', :locals => {:query => query}%> | ||
| </fieldset> | ||
|
|
||
| <% unless params[:gantt] %> | ||
| <fieldset><legend><%= l(:label_sort) %></legend> | ||
| <% 3.times do |i| %> | ||
| <%= i+1 %>: | ||
| <%= label_tag "query_sort_criteria_attribute_" + i.to_s, | ||
| l(:description_query_sort_criteria_attribute), :class => "hidden-for-sighted" %> | ||
| <%= select_tag("query[sort_criteria][#{i}][]", | ||
| options_for_select([[]] + query.available_and_visible_columns.select(&:sortable?).collect {|column| [column.caption, column.name.to_s]}, @query.sort_criteria_key(i)), | ||
| :id => "query_sort_criteria_attribute_" + i.to_s)%> | ||
| <%= label_tag "query_sort_criteria_direction_" + i.to_s, | ||
| l(:description_query_sort_criteria_direction), :class => "hidden-for-sighted" %> | ||
| <%= select_tag("query[sort_criteria][#{i}][]", | ||
| options_for_select([[], [l(:label_ascending), 'asc'], [l(:label_descending), 'desc']], @query.sort_criteria_order(i)), | ||
| :id => "query_sort_criteria_direction_" + i.to_s) %> | ||
| <br /> | ||
| <% end %> | ||
| </fieldset> | ||
| <% end %> | ||
|
|
||
| <% unless params[:gantt] %> | ||
| <%= content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %> | ||
| <legend><%= l(:field_column_names) %></legend> | ||
| <%= render_query_columns_selection(query) %> | ||
| <% end %> | ||
| <% end %> | ||
|
|
||
| </div> | ||
|
|
||
| <%= javascript_tag do %> | ||
| $(document).ready(function(){ | ||
| $("input[name='query[visibility]']").change(function(){ | ||
| var checked = $('#query_visibility_1').is(':checked'); | ||
| $("input[name='query[role_ids][]'][type=checkbox]").attr('disabled', !checked); | ||
| }).trigger('change'); | ||
| }); | ||
| <% end %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.