Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
sakia
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
78
Issues
78
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
clients
python
sakia
Commits
eaada992
Commit
eaada992
authored
Apr 03, 2020
by
Vincent Texier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[fix] fix bug in tx history table_model.py conditions field update
Fix test
parent
f20cb71b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
src/sakia/gui/navigation/txhistory/table_model.py
src/sakia/gui/navigation/txhistory/table_model.py
+1
-1
tests/functional/test_txhistory_controller.py
tests/functional/test_txhistory_controller.py
+5
-1
No files found.
src/sakia/gui/navigation/txhistory/table_model.py
View file @
eaada992
...
...
@@ -147,7 +147,7 @@ class HistoryTableModel(QAbstractTableModel):
sources_conditions
=
[
source
.
conditions
for
source
in
sources
if
"
%&&%"
in
source
.
conditions
or
"%||%
"
in
source
.
conditions
if
"
&&"
in
source
.
conditions
or
"||
"
in
source
.
conditions
]
transfer
.
conditions
=
(
sources_conditions
[
0
]
if
len
(
sources_conditions
)
>
0
else
None
...
...
tests/functional/test_txhistory_controller.py
View file @
eaada992
...
...
@@ -65,9 +65,13 @@ async def test_tx_history_table_model(
history_table_model
.
change_transfer
(
transfers
[
0
])
assert
len
(
history_table_model
.
transfers_data
)
==
2
conditions_data
=
history_table_model
.
transfers_data
[
1
][
conditions_data
=
history_table_model
.
transfers_data
[
0
][
HistoryTableModel
.
columns_types
.
index
(
"conditions"
)
]
if
conditions_data
is
None
:
conditions_data
=
history_table_model
.
transfers_data
[
1
][
HistoryTableModel
.
columns_types
.
index
(
"conditions"
)
]
assert
(
conditions_data
==
"SIG(F3HWkYnUSbdpEueosKqzYd1m8ftwojwE2uXR7ScoAVKo) || (SIG(GfFUvqaVSgCt6nFDQCAuULWk6K16MUDckeyBJQFcaYj7) && CSV(604800))"
...
...
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