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
9ab303e5
Commit
9ab303e5
authored
Jun 07, 2012
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some coding style improvements
parent
058f8d5f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
0 deletions
+7
-0
weblate/trans/models.py
weblate/trans/models.py
+7
-0
No files found.
weblate/trans/models.py
View file @
9ab303e5
...
@@ -261,6 +261,7 @@ class SubProject(models.Model):
...
@@ -261,6 +261,7 @@ class SubProject(models.Model):
'''
'''
if
self
.
is_repo_link
():
if
self
.
is_repo_link
():
return
self
.
get_linked_repo
().
get_path
()
return
self
.
get_linked_repo
().
get_path
()
return
os
.
path
.
join
(
self
.
project
.
get_path
(),
self
.
slug
)
return
os
.
path
.
join
(
self
.
project
.
get_path
(),
self
.
slug
)
def
get_lock_path
(
self
):
def
get_lock_path
(
self
):
...
@@ -311,8 +312,10 @@ class SubProject(models.Model):
...
@@ -311,8 +312,10 @@ class SubProject(models.Model):
'''
'''
if
self
.
is_repo_link
():
if
self
.
is_repo_link
():
return
self
.
get_linked_repo
().
get_repoweb_link
(
filename
,
line
)
return
self
.
get_linked_repo
().
get_repoweb_link
(
filename
,
line
)
if
self
.
repoweb
==
''
or
self
.
repoweb
is
None
:
if
self
.
repoweb
==
''
or
self
.
repoweb
is
None
:
return
None
return
None
return
self
.
repoweb
%
{
return
self
.
repoweb
%
{
'file'
:
filename
,
'file'
:
filename
,
'line'
:
line
,
'line'
:
line
,
...
@@ -325,8 +328,10 @@ class SubProject(models.Model):
...
@@ -325,8 +328,10 @@ class SubProject(models.Model):
'''
'''
if
self
.
is_repo_link
():
if
self
.
is_repo_link
():
return
self
.
get_linked_repo
().
pull_repo
(
validate
,
gitrepo
)
return
self
.
get_linked_repo
().
pull_repo
(
validate
,
gitrepo
)
if
gitrepo
is
None
:
if
gitrepo
is
None
:
gitrepo
=
self
.
get_repo
()
gitrepo
=
self
.
get_repo
()
# Update
# Update
logger
.
info
(
'updating repo %s'
,
self
.
__unicode__
())
logger
.
info
(
'updating repo %s'
,
self
.
__unicode__
())
try
:
try
:
...
@@ -377,6 +382,7 @@ class SubProject(models.Model):
...
@@ -377,6 +382,7 @@ class SubProject(models.Model):
'''
'''
if
self
.
is_repo_link
():
if
self
.
is_repo_link
():
return
self
.
get_linked_repo
().
configure_branch
()
return
self
.
get_linked_repo
().
configure_branch
()
gitrepo
=
self
.
get_repo
()
gitrepo
=
self
.
get_repo
()
# create branch if it does not exist
# create branch if it does not exist
...
@@ -420,6 +426,7 @@ class SubProject(models.Model):
...
@@ -420,6 +426,7 @@ class SubProject(models.Model):
'''
'''
if
self
.
is_repo_link
():
if
self
.
is_repo_link
():
return
self
.
get_linked_repo
().
do_push
(
request
)
return
self
.
get_linked_repo
().
do_push
(
request
)
# Do we have push configured
# Do we have push configured
if
not
self
.
can_push
():
if
not
self
.
can_push
():
messages
.
error
(
request
,
_
(
'Push is disabled for %s.'
)
%
self
.
__unicode__
())
messages
.
error
(
request
,
_
(
'Push is disabled for %s.'
)
%
self
.
__unicode__
())
...
...
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