Skip to content

Commit 48da7e7

Browse files
committed
cleanup
1 parent 1e33c5f commit 48da7e7

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
9595
return isLogged;
9696
},
9797

98-
startStudyById: function(studyId, openCB, cancelCB, isStudyCreation = false, skipStudyOptions = false) {
98+
startStudyById: function(studyId, openCB, cancelCB, isStudyCreation = false) {
9999
if (!osparc.dashboard.ResourceBrowserBase.checkLoggedIn()) {
100100
return;
101101
}
@@ -117,12 +117,9 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
117117
osparc.data.Resources.fetch("studies", "getWallet", params)
118118
.then(wallet => {
119119
if (
120-
!skipStudyOptions &&
121-
(
122-
isStudyCreation ||
123-
wallet === null ||
124-
osparc.desktop.credits.Utils.getWallet(wallet["walletId"]) === null
125-
)
120+
isStudyCreation ||
121+
wallet === null ||
122+
osparc.desktop.credits.Utils.getWallet(wallet["walletId"]) === null
126123
) {
127124
// pop up study options if the study was just created or if it has no wallet assigned or user has no access to it
128125
const resourceSelector = new osparc.study.StudyOptions(studyId);
@@ -463,11 +460,11 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
463460
throw new Error("Abstract method called!");
464461
},
465462

466-
_startStudyById: function(studyId, openCB, cancelCB, isStudyCreation = false, skipStudyOptions = false) {
463+
_startStudyById: function(studyId, openCB, cancelCB, isStudyCreation = false) {
467464
if (isStudyCreation) {
468465
this.fireDataEvent("changeTab", "studiesTab");
469466
}
470-
this.self().startStudyById(studyId, openCB, cancelCB, isStudyCreation, skipStudyOptions);
467+
this.self().startStudyById(studyId, openCB, cancelCB, isStudyCreation);
471468
},
472469

473470
_createStudyFromTemplate: function() {

services/static-webserver/client/source/class/osparc/dashboard/TemplateBrowser.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,7 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
151151
osparc.data.Resources.fetch("studies", "delete", params);
152152
};
153153
const isStudyCreation = true;
154-
const skipStudyOptions = true;
155-
this._startStudyById(studyId, openCB, cancelCB, isStudyCreation, skipStudyOptions);
154+
this._startStudyById(studyId, openCB, cancelCB, isStudyCreation);
156155
})
157156
.catch(err => {
158157
this._hideLoadingPage();

services/static-webserver/client/source/class/osparc/study/StudyOptions.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,15 +228,13 @@ qx.Class.define("osparc.study.StudyOptions", {
228228
__buildTopSummaryLayout: function() {
229229
const store = osparc.store.Store.getInstance();
230230

231-
this._createChildControlImpl("title-label");
232231
const titleField = this.getChildControl("title-field");
233232
titleField.addListener("appear", () => {
234233
titleField.focus();
235234
titleField.activate();
236235
});
237236

238237
// Wallet Selector
239-
this._createChildControlImpl("wallet-selector-label");
240238
const walletSelector = this.getChildControl("wallet-selector");
241239

242240
const wallets = store.getWallets();

0 commit comments

Comments
 (0)