Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
94020604
Commit
94020604
authored
Apr 17, 2015
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert perms.trans.reset_translation to new model
Signed-off-by:
Michal Čihař
<
michal@cihar.com
>
parent
d9113f5c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
5 deletions
+27
-5
weblate/html/js/git-status.html
weblate/html/js/git-status.html
+2
-1
weblate/trans/permissions.py
weblate/trans/permissions.py
+8
-0
weblate/trans/templatetags/permissions.py
weblate/trans/templatetags/permissions.py
+5
-0
weblate/trans/views/git.py
weblate/trans/views/git.py
+12
-4
No files found.
weblate/html/js/git-status.html
View file @
94020604
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
{% can_commit_translation user project as user_can_commit_translation %}
{% can_commit_translation user project as user_can_commit_translation %}
{% can_update_translation user project as user_can_update_translation %}
{% can_update_translation user project as user_can_update_translation %}
{% can_reset_translation user project as user_can_reset_translation %}
<div
class=
"row"
>
<div
class=
"row"
>
...
@@ -142,7 +143,7 @@
...
@@ -142,7 +143,7 @@
</tr>
</tr>
{% endif %}
{% endif %}
{% if
perms.trans.
reset_translation %}
{% if
user_can_
reset_translation %}
<tr>
<tr>
<td>
<td>
<a
href=
"{{ object.get_reset_url }}"
class=
"btn btn-default confirm-reset"
>
{% trans "Reset" %}
</a>
<a
href=
"{{ object.get_reset_url }}"
class=
"btn btn-default confirm-reset"
>
{% trans "Reset" %}
</a>
...
...
weblate/trans/permissions.py
View file @
94020604
...
@@ -176,3 +176,11 @@ def can_update_translation(user, project):
...
@@ -176,3 +176,11 @@ def can_update_translation(user, project):
Checks whether user can update translation repository.
Checks whether user can update translation repository.
"""
"""
return
check_permission
(
user
,
project
,
'trans.update_translation'
)
return
check_permission
(
user
,
project
,
'trans.update_translation'
)
@
cache_permission
def
can_reset_translation
(
user
,
project
):
"""
Checks whether user can reset translation repository.
"""
return
check_permission
(
user
,
project
,
'trans.reset_translation'
)
weblate/trans/templatetags/permissions.py
View file @
94020604
...
@@ -76,3 +76,8 @@ def can_commit_translation(user, project):
...
@@ -76,3 +76,8 @@ def can_commit_translation(user, project):
@
register
.
assignment_tag
@
register
.
assignment_tag
def
can_update_translation
(
user
,
project
):
def
can_update_translation
(
user
,
project
):
return
weblate
.
trans
.
permissions
.
can_update_translation
(
user
,
project
)
return
weblate
.
trans
.
permissions
.
can_update_translation
(
user
,
project
)
@
register
.
assignment_tag
def
can_reset_translation
(
user
,
project
):
return
weblate
.
trans
.
permissions
.
can_reset_translation
(
user
,
project
)
weblate/trans/views/git.py
View file @
94020604
...
@@ -27,7 +27,9 @@ from weblate.trans.views.helper import (
...
@@ -27,7 +27,9 @@ from weblate.trans.views.helper import (
)
)
from
weblate.trans.filelock
import
FileLockException
from
weblate.trans.filelock
import
FileLockException
from
weblate.trans.util
import
redirect_param
from
weblate.trans.util
import
redirect_param
from
weblate.trans.permissions
import
can_commit_translation
from
weblate.trans.permissions
import
(
can_commit_translation
,
can_update_translation
,
can_reset_translation
,
)
def
execute_locked
(
request
,
obj
,
message
,
call
,
*
args
,
**
kwargs
):
def
execute_locked
(
request
,
obj
,
message
,
call
,
*
args
,
**
kwargs
):
...
@@ -172,22 +174,28 @@ def push_translation(request, project, subproject, lang):
...
@@ -172,22 +174,28 @@ def push_translation(request, project, subproject, lang):
return
perform_push
(
request
,
obj
)
return
perform_push
(
request
,
obj
)
@
permission_required
(
'trans.reset_translation'
)
def
reset_project
(
request
,
project
):
def
reset_project
(
request
,
project
):
obj
=
get_project
(
request
,
project
)
obj
=
get_project
(
request
,
project
)
if
not
can_reset_translation
(
request
.
user
,
obj
):
raise
PermissionDenied
()
return
perform_reset
(
request
,
obj
)
return
perform_reset
(
request
,
obj
)
@
permission_required
(
'trans.reset_translation'
)
def
reset_subproject
(
request
,
project
,
subproject
):
def
reset_subproject
(
request
,
project
,
subproject
):
obj
=
get_subproject
(
request
,
project
,
subproject
)
obj
=
get_subproject
(
request
,
project
,
subproject
)
if
not
can_reset_translation
(
request
.
user
,
obj
.
subproject
):
raise
PermissionDenied
()
return
perform_reset
(
request
,
obj
)
return
perform_reset
(
request
,
obj
)
@
permission_required
(
'trans.reset_translation'
)
def
reset_translation
(
request
,
project
,
subproject
,
lang
):
def
reset_translation
(
request
,
project
,
subproject
,
lang
):
obj
=
get_translation
(
request
,
project
,
subproject
,
lang
)
obj
=
get_translation
(
request
,
project
,
subproject
,
lang
)
if
not
can_reset_translation
(
request
.
user
,
obj
.
subproject
.
translation
):
raise
PermissionDenied
()
return
perform_reset
(
request
,
obj
)
return
perform_reset
(
request
,
obj
)
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