Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Cesium
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
clients
Cesium-grp
Cesium
Commits
d6c1737d
Commit
d6c1737d
authored
6 years ago
by
Benoit Lavenier
Browse files
Options
Downloads
Patches
Plain Diff
[fix] TX history: "show all" button not working - fix
#727
parent
fcbcec72
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#2860
failed
6 years ago
Stage: github-sync
Stage: build
Stage: publish
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
platforms/desktop
+1
-1
1 addition, 1 deletion
platforms/desktop
www/js/controllers/wallet-controllers.js
+4
-2
4 additions, 2 deletions
www/js/controllers/wallet-controllers.js
www/js/services/wallet-services.js
+5
-0
5 additions, 0 deletions
www/js/services/wallet-services.js
with
10 additions
and
3 deletions
desktop
@
3d8750ea
Compare
b828d3b5
...
3d8750ea
Subproject commit
b828d3b53a649d2c64b935c75bdc782358d1c496
Subproject commit
3d8750ea54cf459784c1f3c425b2b44845688642
This diff is collapsed.
Click to expand it.
www/js/controllers/wallet-controllers.js
+
4
−
2
View file @
d6c1737d
...
@@ -694,8 +694,10 @@ function WalletTxController($scope, $ionicPopover, $state, $timeout, $location,
...
@@ -694,8 +694,10 @@ function WalletTxController($scope, $ionicPopover, $state, $timeout, $location,
$scope
.
load
=
function
()
{
$scope
.
load
=
function
()
{
if
(
!
wallet
)
return
;
if
(
!
wallet
)
return
;
var
hasMinData
=
wallet
.
isDataLoaded
({
minData
:
true
});
var
options
=
{
var
options
=
{
minData
:
!
wallet
.
isDataLoaded
({
minData
:
true
}),
requirements
:
!
hasMinData
,
// load requirements (=minData) once
minData
:
!
hasMinData
,
sources
:
true
,
sources
:
true
,
tx
:
{
tx
:
{
enable
:
true
enable
:
true
...
@@ -836,7 +838,7 @@ function WalletTxController($scope, $ionicPopover, $state, $timeout, $location,
...
@@ -836,7 +838,7 @@ function WalletTxController($scope, $ionicPopover, $state, $timeout, $location,
(
Math
.
trunc
(
new
Date
().
getTime
()
/
1000
)
-
2
*
csSettings
.
data
.
walletHistoryTimeSecond
);
(
Math
.
trunc
(
new
Date
().
getTime
()
/
1000
)
-
2
*
csSettings
.
data
.
walletHistoryTimeSecond
);
UIUtils
.
loading
.
show
();
UIUtils
.
loading
.
show
();
return
csW
allet
.
refreshData
({
tx
:
{
enable
:
true
,
fromTime
:
fromTime
}})
return
w
allet
.
refreshData
({
tx
:
{
enable
:
true
,
fromTime
:
fromTime
}})
.
then
(
function
()
{
.
then
(
function
()
{
$scope
.
updateView
();
$scope
.
updateView
();
UIUtils
.
loading
.
hide
();
UIUtils
.
loading
.
hide
();
...
...
This diff is collapsed.
Click to expand it.
www/js/services/wallet-services.js
+
5
−
0
View file @
d6c1737d
...
@@ -914,6 +914,11 @@ angular.module('cesium.wallet.services', ['ngApi', 'ngFileSaver', 'cesium.bma.se
...
@@ -914,6 +914,11 @@ angular.module('cesium.wallet.services', ['ngApi', 'ngFileSaver', 'cesium.bma.se
// Force some load (requirements) if not already loaded
// Force some load (requirements) if not already loaded
options
.
requirements
=
angular
.
isDefined
(
options
.
requirements
)
?
options
.
requirements
:
angular
.
isDefined
(
data
.
requirements
.
needSelf
);
options
.
requirements
=
angular
.
isDefined
(
options
.
requirements
)
?
options
.
requirements
:
angular
.
isDefined
(
data
.
requirements
.
needSelf
);
// Force sources when TX enable
if
(
angular
.
isUndefined
(
options
.
sources
)
&&
options
.
tx
&&
options
.
tx
.
enable
)
{
options
.
sources
=
true
;
}
var
jobs
=
[];
var
jobs
=
[];
// Get requirements
// Get requirements
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment