Skip to content

Commit 2c8ac3c

Browse files
dentaku7dentaku7
committed
Fix "modified" label, save dashboard.
1 parent 2bdf134 commit 2c8ac3c

File tree

5 files changed

+26
-12
lines changed

5 files changed

+26
-12
lines changed

‎cubesviewer/cubesviewer.templates.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ angular.module('cv').run(['$templateCache', function($templateCache) {
9999
" <button type=\"button\" ng-click=\"studioViewsService.toggleCollapseView(view)\" class=\"btn btn-primary btn-xs pull-right hidden-print\" style=\"margin-left: 5px;\"><i class=\"fa fa-fw\" ng-class=\"{'fa-caret-up': !view.collapsed, 'fa-caret-down': view.collapsed }\"></i></button>\n" +
100100
"\n" +
101101
" <i class=\"fa fa-fw fa-file\"></i> <span class=\"cv-gui-title\" style=\"cursor: pointer;\" ng-dblclick=\"studioViewsService.studioScope.showRenameView(view)\"><a name=\"cvView{{ view.id }}\"></a><span ng-if=\"view.params.menu_path\">{{view.params.menu_path}}&colon;&nbsp;</span>{{ view.params.name }}</span>\n" +
102-
"\n" +
102+
"{{view.savedId}}\n" +
103103
" <span ng-if=\"view.savedId > 0 && reststoreService.isViewChanged(view)\" class=\"badge cv-gui-container-state\" style=\"margin-left: 15px; font-size: 80%;\">Modified</span>\n" +
104104
" <span ng-if=\"view.savedId > 0 && !reststoreService.isViewChanged(view)\" class=\"badge cv-gui-container-state\" style=\"margin-left: 15px; font-size: 80%;\">Saved</span>\n" +
105105
" <span ng-if=\"view.shared\" class=\"badge cv-gui-container-state\" style=\"margin-left: 5px; font-size: 80%;\">Shared</span>\n" +

‎cubesviewer/server/reststore.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ angular.module('cv.studio').service("reststoreService", ['$rootScope', '$http',
169169

170170
// Find differences
171171
if (sview != null) {
172-
if (view.params.name != sview.name) return true;
172+
if (view.name != sview.name) return true;
173173
if (view.shared != sview.shared) return true;
174174
if (viewsService.serializeView(view) != sview.data) return true;
175175
}
@@ -213,6 +213,7 @@ angular.module('cv.studio').service("reststoreService", ['$rootScope', '$http',
213213
view.owner = savedview.owner;
214214
view.shared = savedview.shared;
215215
view.help = savedview.help;
216+
view.name = savedview.name;
216217
} else {
217218
view.savedId = 0;
218219
view.owner = cvOptions.user;

‎cubesviewer/studio/studio.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ function construct_menu(menu) {
231231
return r;
232232
}
233233

234-
angular.module('cv.studio').controller("CubesViewerStudioController", ['$rootScope', '$scope', '$uibModal', '$element', '$timeout', 'cvOptions', 'cubesService', 'studioViewsService', 'viewsService', 'reststoreService',
235-
function ($rootScope, $scope, $uibModal, $element, $timeout, cvOptions, cubesService, studioViewsService, viewsService, reststoreService) {
234+
angular.module('cv.studio').controller("CubesViewerStudioController", ['$rootScope', '$scope', '$uibModal', '$element', '$timeout', 'cvOptions', 'cubesService', 'studioViewsService', 'viewsService', 'reststoreService', 'dialogService',
235+
function ($rootScope, $scope, $uibModal, $element, $timeout, cvOptions, cubesService, studioViewsService, viewsService, reststoreService, dialogService) {
236236

237237
$scope.cvVersion = cubesviewer.version;
238238
$scope.cvOptions = cvOptions;
@@ -414,7 +414,13 @@ angular.module('cv.studio').controller("CubesViewerStudioController", ['$rootSco
414414
*/
415415
$scope.saveDashboard = function () {
416416
reststoreService.dashboard.views = [];
417-
studioViewsService.views.forEach(function (v) {reststoreService.dashboard.views.unshift(v.savedId)});
417+
studioViewsService.views.forEach(function (v) {
418+
if (!v.saveId) {
419+
dialogService.show("Save all opened views first.");
420+
return;
421+
}
422+
reststoreService.dashboard.views.unshift(v.savedId)
423+
});
418424
reststoreService.saveDashboard();
419425
};
420426

‎dist/cubesviewer.js‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7589,8 +7589,8 @@ function construct_menu(menu) {
75897589
return r;
75907590
}
75917591

7592-
angular.module('cv.studio').controller("CubesViewerStudioController", ['$rootScope', '$scope', '$uibModal', '$element', '$timeout', 'cvOptions', 'cubesService', 'studioViewsService', 'viewsService', 'reststoreService',
7593-
function ($rootScope, $scope, $uibModal, $element, $timeout, cvOptions, cubesService, studioViewsService, viewsService, reststoreService) {
7592+
angular.module('cv.studio').controller("CubesViewerStudioController", ['$rootScope', '$scope', '$uibModal', '$element', '$timeout', 'cvOptions', 'cubesService', 'studioViewsService', 'viewsService', 'reststoreService', 'dialogService',
7593+
function ($rootScope, $scope, $uibModal, $element, $timeout, cvOptions, cubesService, studioViewsService, viewsService, reststoreService, dialogService) {
75947594

75957595
$scope.cvVersion = cubesviewer.version;
75967596
$scope.cvOptions = cvOptions;
@@ -7772,7 +7772,13 @@ angular.module('cv.studio').controller("CubesViewerStudioController", ['$rootSco
77727772
*/
77737773
$scope.saveDashboard = function () {
77747774
reststoreService.dashboard.views = [];
7775-
studioViewsService.views.forEach(function (v) {reststoreService.dashboard.views.unshift(v.savedId)});
7775+
studioViewsService.views.forEach(function (v) {
7776+
if (!v.saveId) {
7777+
dialogService.show("Save all opened views first.");
7778+
return;
7779+
}
7780+
reststoreService.dashboard.views.unshift(v.savedId)
7781+
});
77767782
reststoreService.saveDashboard();
77777783
};
77787784

@@ -8311,7 +8317,7 @@ angular.module('cv.studio').service("reststoreService", ['$rootScope', '$http',
83118317

83128318
// Find differences
83138319
if (sview != null) {
8314-
if (view.params.name != sview.name) return true;
8320+
if (view.name != sview.name) return true;
83158321
if (view.shared != sview.shared) return true;
83168322
if (viewsService.serializeView(view) != sview.data) return true;
83178323
}
@@ -8355,6 +8361,7 @@ angular.module('cv.studio').service("reststoreService", ['$rootScope', '$http',
83558361
view.owner = savedview.owner;
83568362
view.shared = savedview.shared;
83578363
view.help = savedview.help;
8364+
view.name = savedview.name;
83588365
} else {
83598366
view.savedId = 0;
83608367
view.owner = cvOptions.user;
@@ -8683,7 +8690,7 @@ angular.module('cv.cubes').service("gaService", ['$rootScope', '$http', '$cookie
86838690
" <button type=\"button\" ng-click=\"studioViewsService.toggleCollapseView(view)\" class=\"btn btn-primary btn-xs pull-right hidden-print\" style=\"margin-left: 5px;\"><i class=\"fa fa-fw\" ng-class=\"{'fa-caret-up': !view.collapsed, 'fa-caret-down': view.collapsed }\"></i></button>\n" +
86848691
"\n" +
86858692
" <i class=\"fa fa-fw fa-file\"></i> <span class=\"cv-gui-title\" style=\"cursor: pointer;\" ng-dblclick=\"studioViewsService.studioScope.showRenameView(view)\"><a name=\"cvView{{ view.id }}\"></a><span ng-if=\"view.params.menu_path\">{{view.params.menu_path}}&colon;&nbsp;</span>{{ view.params.name }}</span>\n" +
8686-
"\n" +
8693+
"{{view.savedId}}\n" +
86878694
" <span ng-if=\"view.savedId > 0 && reststoreService.isViewChanged(view)\" class=\"badge cv-gui-container-state\" style=\"margin-left: 15px; font-size: 80%;\">Modified</span>\n" +
86888695
" <span ng-if=\"view.savedId > 0 && !reststoreService.isViewChanged(view)\" class=\"badge cv-gui-container-state\" style=\"margin-left: 15px; font-size: 80%;\">Saved</span>\n" +
86898696
" <span ng-if=\"view.shared\" class=\"badge cv-gui-container-state\" style=\"margin-left: 5px; font-size: 80%;\">Shared</span>\n" +

‎dist/cubesviewer.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)