Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed editation of TimeEntry; Fixed custom timesheet generating 404 e…

…rror page
  • Loading branch information...
commit c657959908904ed8fb57433de8a81b0086b128e4 1 parent 884a7af
@fprochazka authored
View
5 vendor/plugins/redmine_timesheet_extensions/app/views/custom_timesheets/report.html.erb
@@ -78,7 +78,4 @@
<%= javascript_include_tag 'context_menu' %>
<%= stylesheet_link_tag 'context_menu' %>
<%= stylesheet_link_tag "main.css", :plugin => "redmine_timesheet_extensions", :media => 'all' %>
-<% end %>
-
-<div id="context-menu" style="display: none;"></div>
-<%= javascript_tag "new ContextMenu('#{url_for(:controller => 'timesheet', :action => 'context_menu')}')" %>
+<% end %>
View
57 vendor/plugins/redmine_timesheet_extensions/app/views/timelog/edit.rhtml
@@ -1,57 +0,0 @@
-<%
- # TODO concettualmente questi metodi sono helper e andrebbero quindi definiti
- # nel file helper
-
- # Aggiunge uno "0" davanti al numero passato se è minore di 10
- def hours_min_string(number)
- str = number.to_s
- str = "0#{number}" if number < 10
- str
- end
-
- # Restituisce un array di interi da 0 a 55 andando di 5 in 5
- def minutes
- mins = Array.new
- (0..3).each { |i| mins << 15 * i}
- mins
- end
-%>
-
-<h2><%= l(:label_spent_time) %></h2>
-
-<% labelled_tabular_form_for :time_entry, @time_entry, :url => {:action => 'edit', :id => @time_entry, :project_id => @time_entry.project} do |f| %>
- <%= error_messages_for 'time_entry' %>
- <%= back_url_hidden_field_tag %>
-
- <div class="box">
- <p><%= f.text_field :issue_id, :size => 6 %> <em><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></em></p>
- <p><%= f.text_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 %></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 %>
-
- <%# CPRS-MO %>
-
- <div class="custom_time_fields">
- <%= render :partial => 'common/custom_fields', :locals => {:time_entry => f} %>
- </div>
-
- <%
- # FIXME
- # questa vista sovrascrive una vista esistente e si trova in un plugin:
- # lo hook non può essere chiamato da qui. non si sa cosa succede se
- # un altro componente usa lo hook (se questo è definito perché la vista
- # è stata già sovrascritta, se invece non è definito oppure se avvengono
- # situazioni inconsistenti).
- #
- # call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f })
- %>
-
- <%# ECPRS-MO %>
- </div>
-
- <%= submit_tag l(:button_save) %>
-<% end %>
View
1  vendor/plugins/redmine_timesheet_extensions/config/locales/cs.yml
@@ -9,6 +9,7 @@ cs:
error_et_mandatory_ifnot_hours: is mandatory if Hours field is empty
error_h_mb_grthan_zero: musí být větší než 0
+ timesheet_create_entry: Zaznamenat čas
timesheet_title: Přehled časů
timesheet_period: Interval
timesheet_date_from_label: Od
View
1  vendor/plugins/redmine_timesheet_extensions/config/locales/en.yml
@@ -9,6 +9,7 @@ en:
error_et_mandatory_ifnot_hours: is mandatory if Hours field is empty
error_h_mb_grthan_zero: must be grater than 0
+ timesheet_create_entry: Enter time
timesheet_title: Timesheet
timesheet_period: Period
timesheet_date_from_label: From
Please sign in to comment.
Something went wrong with that request. Please try again.