Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
redmine_v2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VeNtura
redmine_v2
Commits
3aa0f8d1
Commit
3aa0f8d1
authored
Sep 30, 2019
by
Van Hau Le
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issue
parent
67d8154e
Pipeline
#73
canceled with stages
in 0 seconds
Changes
5
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
app/controllers/context_menus_controller.rb
+1
-1
app/views/issues/_action_menu.html.erb
+1
-1
app/views/issues/_edit.html.erb
+1
-1
app/views/timelog/index.html.erb
+1
-1
app/views/timelog/report.html.erb
+1
-1
No files found.
app/controllers/context_menus_controller.rb
View file @
3aa0f8d1
...
@@ -30,7 +30,7 @@ class ContextMenusController < ApplicationController
...
@@ -30,7 +30,7 @@ class ContextMenusController < ApplicationController
@allowed_statuses
=
@issues
.
map
(
&
:new_statuses_allowed_to
).
reduce
(
:&
)
@allowed_statuses
=
@issues
.
map
(
&
:new_statuses_allowed_to
).
reduce
(
:&
)
@can
=
{
:edit
=>
@issues
.
all?
(
&
:attributes_editable?
),
@can
=
{
:edit
=>
@issues
.
all?
(
&
:attributes_editable?
),
:log_time
=>
(
@project
&&
User
.
current
.
allowed_to?
(
:log_time
,
@project
)
&&
!
@issue
.
is_user_story?
),
:log_time
=>
(
@project
&&
User
.
current
.
allowed_to?
(
:log_time
,
@project
)
&&
!
@issue
&
.
is_user_story?
),
:copy
=>
User
.
current
.
allowed_to?
(
:copy_issues
,
@projects
)
&&
Issue
.
allowed_target_projects
.
any?
,
:copy
=>
User
.
current
.
allowed_to?
(
:copy_issues
,
@projects
)
&&
Issue
.
allowed_target_projects
.
any?
,
:add_watchers
=>
User
.
current
.
allowed_to?
(
:add_issue_watchers
,
@projects
),
:add_watchers
=>
User
.
current
.
allowed_to?
(
:add_issue_watchers
,
@projects
),
:delete
=>
@issues
.
all?
(
&
:deletable?
)
:delete
=>
@issues
.
all?
(
&
:deletable?
)
...
...
app/views/issues/_action_menu.html.erb
View file @
3aa0f8d1
<div
class=
"contextual"
>
<div
class=
"contextual"
>
<%=
link_to
l
(
:button_edit
),
edit_issue_path
(
@issue
),
:onclick
=>
'showAndScrollTo("update", "issue_notes"); return false;'
,
:class
=>
'icon icon-edit'
,
:accesskey
=>
accesskey
(
:edit
)
if
@issue
.
editable?
%>
<%=
link_to
l
(
:button_edit
),
edit_issue_path
(
@issue
),
:onclick
=>
'showAndScrollTo("update", "issue_notes"); return false;'
,
:class
=>
'icon icon-edit'
,
:accesskey
=>
accesskey
(
:edit
)
if
@issue
.
editable?
%>
<%=
link_to
l
(
:button_log_time
),
new_issue_time_entry_path
(
@issue
),
:class
=>
'icon icon-time-add'
if
User
.
current
.
allowed_to?
(
:log_time
,
@project
)
&&
!
@issue
.
is_user_story?
%>
<%=
link_to
l
(
:button_log_time
),
new_issue_time_entry_path
(
@issue
),
:class
=>
'icon icon-time-add'
if
User
.
current
.
allowed_to?
(
:log_time
,
@project
)
&&
!
@issue
&
.
is_user_story?
%>
<%=
watcher_link
(
@issue
,
User
.
current
)
%>
<%=
watcher_link
(
@issue
,
User
.
current
)
%>
<%=
link_to
l
(
:button_copy
),
project_copy_issue_path
(
@project
,
@issue
),
:class
=>
'icon icon-copy'
if
User
.
current
.
allowed_to?
(
:copy_issues
,
@project
)
&&
Issue
.
allowed_target_projects
.
any?
%>
<%=
link_to
l
(
:button_copy
),
project_copy_issue_path
(
@project
,
@issue
),
:class
=>
'icon icon-copy'
if
User
.
current
.
allowed_to?
(
:copy_issues
,
@project
)
&&
Issue
.
allowed_target_projects
.
any?
%>
<%=
link_to
l
(
:button_delete
),
issue_path
(
@issue
),
:data
=>
{
:confirm
=>
issues_destroy_confirmation_message
(
@issue
)},
:method
=>
:delete
,
:class
=>
'icon icon-del'
if
@issue
.
deletable?
%>
<%=
link_to
l
(
:button_delete
),
issue_path
(
@issue
),
:data
=>
{
:confirm
=>
issues_destroy_confirmation_message
(
@issue
)},
:method
=>
:delete
,
:class
=>
'icon icon-del'
if
@issue
.
deletable?
%>
...
...
app/views/issues/_edit.html.erb
View file @
3aa0f8d1
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
</div>
</div>
</fieldset>
</fieldset>
<%
end
%>
<%
end
%>
<%
if
User
.
current
.
allowed_to?
(
:log_time
,
@project
)
&&
!
@issue
.
is_user_story?
%>
<%
if
User
.
current
.
allowed_to?
(
:log_time
,
@project
)
&&
!
@issue
&
.
is_user_story?
%>
<fieldset
class=
"tabular"
><legend>
<%=
l
(
:button_log_time
)
%>
</legend>
<fieldset
class=
"tabular"
><legend>
<%=
l
(
:button_log_time
)
%>
</legend>
<%=
labelled_fields_for
:time_entry
,
@time_entry
do
|
time_entry
|
%>
<%=
labelled_fields_for
:time_entry
,
@time_entry
do
|
time_entry
|
%>
<div
class=
"splitcontent"
>
<div
class=
"splitcontent"
>
...
...
app/views/timelog/index.html.erb
View file @
3aa0f8d1
<div
class=
"contextual"
>
<div
class=
"contextual"
>
<%=
link_to
l
(
:button_log_time
),
<%=
link_to
l
(
:button_log_time
),
_new_time_entry_path
(
@project
,
@query
.
filtered_issue_id
),
_new_time_entry_path
(
@project
,
@query
.
filtered_issue_id
),
:class
=>
'icon icon-time-add'
if
User
.
current
.
allowed_to?
(
:log_time
,
@project
,
:global
=>
true
)
&&
!
@issue
.
is_user_story?
%>
:class
=>
'icon icon-time-add'
if
User
.
current
.
allowed_to?
(
:log_time
,
@project
,
:global
=>
true
)
&&
!
@issue
&
.
is_user_story?
%>
</div>
</div>
<h2>
<%=
@query
.
new_record?
?
l
(:
label_spent_time
)
:
@query
.
name
%>
</h2>
<h2>
<%=
@query
.
new_record?
?
l
(:
label_spent_time
)
:
@query
.
name
%>
</h2>
...
...
app/views/timelog/report.html.erb
View file @
3aa0f8d1
<div
class=
"contextual"
>
<div
class=
"contextual"
>
<%=
link_to
l
(
:button_log_time
),
<%=
link_to
l
(
:button_log_time
),
_new_time_entry_path
(
@project
,
@issue
),
_new_time_entry_path
(
@project
,
@issue
),
:class
=>
'icon icon-time-add'
if
User
.
current
.
allowed_to?
(
:log_time
,
@project
,
:global
=>
true
)
&&
!
@issue
.
is_user_story?
%>
:class
=>
'icon icon-time-add'
if
User
.
current
.
allowed_to?
(
:log_time
,
@project
,
:global
=>
true
)
&&
!
@issue
&
.
is_user_story?
%>
</div>
</div>
<h2>
<%=
@query
.
new_record?
?
l
(:
label_spent_time
)
:
@query
.
name
%>
</h2>
<h2>
<%=
@query
.
new_record?
?
l
(:
label_spent_time
)
:
@query
.
name
%>
</h2>
...
...
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