Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Andrew Buddenberg
gcis-py-client
Commits
c69dbef2
Commit
c69dbef2
authored
Mar 18, 2014
by
abuddenberg
Browse files
Fixed incredibily stupid bug in base merge method
parent
4d00ffdb
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/domain.py
View file @
c69dbef2
...
...
@@ -46,7 +46,8 @@ class Gcisbase(object):
for
attr
,
value
in
attrs_we_care_about
:
if
value
in
(
None
,
''
)
and
hasattr
(
other
,
attr
):
setattr
(
self
,
attr
,
value
)
setattr
(
self
,
attr
,
getattr
(
other
,
attr
))
return
self
def
as_json
(
self
,
indent
=
0
,
omit_fields
=
[]):
...
...
@@ -122,7 +123,7 @@ class Figure(Gcisbase):
return
self
.
__str__
()
def
merge
(
self
,
other
):
#Special handling for Chapters
#
Special handling for Chapters
if
isinstance
(
other
.
chapter
,
Chapter
)
and
isinstance
(
self
.
chapter
,
Chapter
):
self
.
chapter
.
merge
(
other
.
chapter
)
...
...
Write
Preview
Supports
Markdown
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