jro_apps/redmine Commit - r15553:7cce582c14a0

1

<%= error_messages_for 'time_entry' %>

1

<%= error_messages_for 'time_entry' %>

2

<%= back_url_hidden_field_tag %>

2

<%= back_url_hidden_field_tag %>

3

4

4

5

<% if @time_entry.new_record? %>

5

<% if @time_entry.new_record? %>

6

<% if params[:project_id] %>

6

<% if params[:project_id] %>

7

<%= hidden_field_tag 'project_id', params[:project_id] %>

7

<%= hidden_field_tag 'project_id', params[:project_id] %>

8

<% elsif params[:issue_id] %>

8

<% elsif params[:issue_id] %>

9

<%= hidden_field_tag 'issue_id', params[:issue_id] %>

9

<%= hidden_field_tag 'issue_id', params[:issue_id] %>

10

<% else %>

10

<% else %>

11

<%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).to_a, :selected => @time_entry.project, :include_blank => true) %>

11

<%= 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 %>

12

<% end %>

12

<% end %>

13

<% end %>

13

<% end %>

14

14

15

<%= f.text_field :issue_id, :size => 6 %>

15

<%= f.text_field :issue_id, :size => 6 %>

16

<% if @time_entry.issue.try(:visible?) %>

16

<% if @time_entry.issue.try(:visible?) %>

17

<%= "#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}" %>

17

<%= "#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}" %>

18

<% end %>

18

<% end %>

19

19

20

<%= f.date_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %>

20

<%= f.date_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %>

21

<%= f.text_field :hours, :size => 6, :required => true %>

21

<%= f.text_field :hours, :size => 6, :required => true %>

22

<%= f.text_field :comments, :size => 100, :maxlength => 1024 %>

22

<%= f.text_field :comments, :size => 100, :maxlength => 1024 %>

23

<%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %>

23

<%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %>

24

<% @time_entry.custom_field_values.each do |value| %>

24

<% @time_entry.custom_field_values.each do |value| %>

25

<%= custom_field_tag_with_label :time_entry, value %>

25

<%= custom_field_tag_with_label :time_entry, value %>

26

<% end %>

26

<% end %>

27

<%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>

27

<%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>

28

</div>

28

</div>

29

30

<%= javascript_tag do %>

30

<%= javascript_tag do %>

31

<% if @time_entry.new_record? %>

31

<% if @time_entry.new_record? %>

32

$(document).ready(function(){

32

$(document).ready(function(){

33

$('#time_entry_project_id, #time_entry_issue_id').change(function(){

33

$('#time_entry_project_id, #time_entry_issue_id').change(function(){

34

$.ajax({

34

$.ajax({

35

url: '<%= escape_javascript new_time_entry_path(:format => 'js') %>',

35

url: '<%= escape_javascript new_time_entry_path(:format => 'js') %>',

36

type: 'post',

36

type: 'post',

37

data: $('#new_time_entry').serialize()

37

data: $('#new_time_entry').serialize()

38

});

38

});

39

});

39

});

40

});

40

});

41

<% end %>

41

<% end %>

42

43

observeAutocompleteField('time_entry_issue_id', '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))%>', {

43

observeAutocompleteField('time_entry_issue_id', '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))%>', {

44

select: function(event, ui) {

44

select: function(event, ui) {

45

$('#time_entry_issue').text(ui.item.label);

45

$('#time_entry_issue').text(ui.item.label);

46

$('#time_entry_issue_id').blur();

46

$('#time_entry_issue_id').blur();

47

}

47

}

48

});

48

});

49

<% end %>

49

<% end %>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             <%= error_messages_for 'time_entry' %>
             <%= back_url_hidden_field_tag %>
             <div class="box tabular">
               <% if @time_entry.new_record? %>
                 <% if params[:project_id] %>
                   <%= hidden_field_tag 'project_id', params[:project_id] %>
                 <% elsif params[:issue_id] %>
                   <%= hidden_field_tag 'issue_id', params[:issue_id] %>
                 <% else %>
-                  <p><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).to_a, :selected => @time_entry.project, :include_blank => true) %></p>
+                  <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>
                 <% end %>
               <% end %>
               <p>
                 <%= f.text_field :issue_id, :size => 6 %>
                 <% if @time_entry.issue.try(:visible?) %>
                   <span id="time_entry_issue"><%= "#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}" %></span>
                 <% end %>
               </p>
               <p><%= f.date_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
               <p><%= f.text_field :hours, :size => 6, :required => true %></p>
               <p><%= f.text_field :comments, :size => 100, :maxlength => 1024 %></p>
               <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 }) %>
             </div>
             <%= javascript_tag do %>
             <% if @time_entry.new_record? %>
               $(document).ready(function(){
                 $('#time_entry_project_id, #time_entry_issue_id').change(function(){
                   $.ajax({
                     url: '<%= escape_javascript new_time_entry_path(:format => 'js') %>',
                     type: 'post',
                     data: $('#new_time_entry').serialize()
                   });
                 });
               });
             <% end %>
               observeAutocompleteField('time_entry_issue_id', '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))%>', {
                 select: function(event, ui) {
                   $('#time_entry_issue').text(ui.item.label);
                   $('#time_entry_issue_id').blur();
                 }
               });
             <% end %>