##// END OF EJS Templates
Option for long text custom fields to be displayed under the description field (#21705)....
Option for long text custom fields to be displayed under the description field (#21705). Based on patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@16251 e93f8b46-1217-0410-a6f0-8f06a7374b81

File last commit:

r15794:04eefdc809b0
r15869:b40d66f39fa8
Show More
_form.html.erb
74 lines | 2.7 KiB | text/plain | TextLexer
Jean-Philippe Lang
Separated new/edit views for the timelog controller....
r8508 <%= error_messages_for 'time_entry' %>
<%= back_url_hidden_field_tag %>
<div class="box tabular">
Toshi MARUYAMA
replace tabs to spaces at app/views/timelog/_form.html.erb...
r10856 <% if @time_entry.new_record? %>
Jean-Philippe Lang
Let the new time_entry form be submitted without project (#17954)....
r13058 <% if params[:project_id] %>
<%= hidden_field_tag 'project_id', params[:project_id] %>
<% elsif params[:issue_id] %>
<%= hidden_field_tag 'issue_id', params[:issue_id] %>
Toshi MARUYAMA
replace tabs to spaces at app/views/timelog/_form.html.erb...
r10856 <% else %>
Jean-Philippe Lang
Project is required....
r15553 <p><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).to_a, :selected => @time_entry.project, :include_blank => true), :required => true %></p>
Toshi MARUYAMA
replace tabs to spaces at app/views/timelog/_form.html.erb...
r10856 <% end %>
<% end %>
<p>
Jean-Philippe Lang
Adds settings to make the issue and/or comment fields mandatory for time logs (#24577)....
r15794 <%= f.text_field :issue_id, :size => 6, :required => Setting.timelog_required_fields.include?('issue_id') %>
Jean-Philippe Lang
Issue subject is not updated when you select another issue on time entry form (#24041)....
r15569 <span id="time_entry_issue">
<%= link_to_issue(@time_entry.issue) if @time_entry.issue.try(:visible?) %>
</span>
Jean-Philippe Lang
Update the issue subject when choosing an issue from the drop down menu....
r10853 </p>
Jean-Philippe Lang
Use HTML5 date input fields instead of text fields with jquery ui date pickers (#19468)....
r14993 <p><%= f.date_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
Jean-Philippe Lang
Show the entered value when it's not valid (#23996)....
r15589 <p><%= f.hours_field :hours, :size => 6, :required => true %></p>
Jean-Philippe Lang
Adds settings to make the issue and/or comment fields mandatory for time logs (#24577)....
r15794 <p><%= f.text_field :comments, :size => 100, :maxlength => 1024, :required => Setting.timelog_required_fields.include?('comments') %></p>
Toshi MARUYAMA
replace tabs to spaces at app/views/timelog/_form.html.erb...
r10856 <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>
<% @time_entry.custom_field_values.each do |value| %>
<p><%= custom_field_tag_with_label :time_entry, value %></p>
<% end %>
<%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
Jean-Philippe Lang
Separated new/edit views for the timelog controller....
r8508 </div>
Jean-Philippe Lang
Adds autocomplete to issue field on time logging form....
r9999
Jean-Philippe Lang
Update the issue subject when choosing an issue from the drop down menu....
r10853 <%= javascript_tag do %>
Jean-Philippe Lang
Update activities list when changing project/issue id on the time entry form (#19656)....
r13905 $(document).ready(function(){
$('#time_entry_project_id, #time_entry_issue_id').change(function(){
$.ajax({
Jean-Philippe Lang
Issue subject is not updated when you select another issue on time entry form (#24041)....
r15569 url: '<%= escape_javascript(@time_entry.new_record? ? new_time_entry_path(:format => 'js') : edit_time_entry_path(:format => 'js')) %>',
Jean-Philippe Lang
Update activities list when changing project/issue id on the time entry form (#19656)....
r13905 type: 'post',
Jean-Philippe Lang
Issue subject is not updated when you select another issue on time entry form (#24041)....
r15569 data: $(this).closest('form').serialize()
Jean-Philippe Lang
Update activities list when changing project/issue id on the time entry form (#19656)....
r13905 });
});
});
Jean-Philippe Lang
Time entry form - limit issue autocomplete to already selected project (#24189)....
r15700 observeAutocompleteField('time_entry_issue_id',
function(request, callback) {
var url = '<%= j auto_complete_issues_path %>';
var data = {
term: request.term
};
var project_id;
<% if @project %>
project_id = '<%= @project.id %>';
<% else %>
project_id = $('#time_entry_project_id').val();
<% end %>
if(project_id){
data['project_id'] = project_id;
} else {
data['scope'] = 'all';
}
$.get(url, data, null, 'json')
.done(function(data){
callback(data);
})
.fail(function(jqXHR, status, error){
callback([]);
});
},
{
select: function(event, ui) {
$('#time_entry_issue').text('');
$('#time_entry_issue_id').val(ui.item.value).change();
}
Jean-Philippe Lang
Update the issue subject when choosing an issue from the drop down menu....
r10853 }
Jean-Philippe Lang
Time entry form - limit issue autocomplete to already selected project (#24189)....
r15700 );
Jean-Philippe Lang
Update the issue subject when choosing an issue from the drop down menu....
r10853 <% end %>