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
e204b8e1
Commit
e204b8e1
authored
Apr 15, 2015
by
Michal Čihař
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not store change object for not yet saved subproject
Signed-off-by:
Michal Čihař
<
michal@cihar.com
>
parent
f6444bef
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
11 deletions
+13
-11
weblate/trans/models/subproject.py
weblate/trans/models/subproject.py
+13
-11
No files found.
weblate/trans/models/subproject.py
View file @
e204b8e1
...
...
@@ -828,11 +828,12 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
'%s remote into repo'
,
self
.
merge_style
,
)
Change
.
objects
.
create
(
subproject
=
self
,
user
=
request
.
user
if
request
else
None
,
action
=
action
,
)
if
self
.
id
:
Change
.
objects
.
create
(
subproject
=
self
,
user
=
request
.
user
if
request
else
None
,
action
=
action
,
)
return
True
except
RepositoryException
as
error
:
# In case merge has failer recover
...
...
@@ -849,12 +850,13 @@ class SubProject(models.Model, PercentMixin, URLMixin, PathMixin):
# Reset repo back
method
(
abort
=
True
)
Change
.
objects
.
create
(
subproject
=
self
,
user
=
request
.
user
if
request
else
None
,
action
=
action_failed
,
target
=
str
(
error
),
)
if
self
.
id
:
Change
.
objects
.
create
(
subproject
=
self
,
user
=
request
.
user
if
request
else
None
,
action
=
action_failed
,
target
=
str
(
error
),
)
# Notify subscribers and admins
self
.
notify_merge_failure
(
error
,
status
)
...
...
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