Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
redmine
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
301
Issues
301
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
coops
redmine
Commits
aa7817bf
Commit
aa7817bf
authored
Jan 04, 2023
by
Félicie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
option date added
parent
e0fed82c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
1 deletions
+6
-1
_form.html.erb
app/views/timelog/_form.html.erb
+3
-1
en.yml
config/locales/en.yml
+1
-0
fr.yml
config/locales/fr.yml
+1
-0
redmine.rb
lib/redmine.rb
+1
-0
No files found.
app/views/timelog/_form.html.erb
View file @
aa7817bf
...
...
@@ -25,7 +25,9 @@
<span>
<%=
link_to_user
(
@time_entry
.
user
)
%>
</span>
</p>
<%
end
%>
<p>
<%=
f
.
date_field
:spent_on
,
:size
=>
10
,
:required
=>
true
%><%=
calendar_for
(
'time_entry_spent_on'
)
%>
</p>
<%
if
User
.
current
.
allowed_to?
(
:edit_date_entries
,
@project
)
%>
<p>
<%=
f
.
date_field
:spent_on
,
:size
=>
10
,
:required
=>
true
%><%=
calendar_for
(
'time_entry_spent_on'
)
%>
</p>
<%
end
%>
<p>
<%=
f
.
hours_field
:hours
,
:size
=>
6
,
:required
=>
true
%>
</p>
<p>
<%=
f
.
text_field
:comments
,
:size
=>
100
,
:maxlength
=>
1024
,
:required
=>
Setting
.
timelog_required_fields
.
include?
(
'comments'
)
%>
</p>
<p>
<%=
f
.
select
:activity_id
,
activity_collection_for_select_options
(
@time_entry
),
:required
=>
true
%>
</p>
...
...
config/locales/en.yml
View file @
aa7817bf
...
...
@@ -517,6 +517,7 @@ en:
permission_add_issue_watchers
:
Add watchers
permission_delete_issue_watchers
:
Delete watchers
permission_log_time
:
Log spent time
permission_edit_date_entries
:
Change the date when entering time spent
permission_view_time_entries
:
View spent time
permission_edit_time_entries
:
Edit time logs
permission_edit_own_time_entries
:
Edit own time logs
...
...
config/locales/fr.yml
View file @
aa7817bf
...
...
@@ -513,6 +513,7 @@ fr:
permission_add_issue_watchers
:
Ajouter des observateurs
permission_delete_issue_watchers
:
Supprimer des observateurs
permission_log_time
:
Saisir le temps passé
permission_edit_date_entries
:
Modifier la date lors de la saisie du temps passé
permission_view_time_entries
:
Voir le temps passé
permission_edit_time_entries
:
Modifier les temps passés
permission_edit_own_time_entries
:
Modifier son propre temps passé
...
...
lib/redmine.rb
View file @
aa7817bf
...
...
@@ -133,6 +133,7 @@ Redmine::AccessControl.map do |map|
map
.
permission
:manage_project_activities
,
{
:projects
=>
:settings
,
:project_enumerations
=>
[
:update
,
:destroy
]},
:require
=>
:member
map
.
permission
:log_time_for_other_users
,
:require
=>
:member
map
.
permission
:import_time_entries
,
{}
map
.
permission
:edit_date_entries
,
{}
end
map
.
project_module
:news
do
|
map
|
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment