Changeset 2810

Timestamp:

11/12/07 06:08:28 (11 months ago)

Author:

JeremyRuston

Message:

Improved ImportTiddlers? to omit the "choose workspace" step if there is only one workspace available (ticket #398)

Files:

• Trunk/core/js/Import.js (modified) (2 diffs)

Trunk/core/js/Import.js

@@ -126 +126 @@
         if(context.status !== true)
                 displayMessage("Error in importTiddlers.onGetWorkspaceList: " + context.statusText);
+        wizard.setValue("context",context);
+        var workspace = wizard.getValue("feedWorkspace");
+        if(!workspace && context.workspaces.length==1)
+                workspace = context.workspaces[0].title;
+        if(workspace) {
+                //# if there is only one workspace, then open it directly
+                var ret = context.adaptor.openWorkspace(workspace,context,wizard,config.macros.importTiddlers.onOpenWorkspace);
+                if(ret !== true)
+                        displayMessage(ret);
+                wizard.setValue("workspace",workspace);
+                wizard.setButtons([{caption: config.macros.importTiddlers.cancelLabel, tooltip: config.macros.importTiddlers.cancelPrompt, onClick: config.macros.importTiddlers.onCancel}],config.macros.importTiddlers.statusOpenWorkspace);
+                return;
+        }
         wizard.addStep(config.macros.importTiddlers.step2Title,config.macros.importTiddlers.step2Html);
         var s = wizard.getElement("selWorkspace");
@@ -143 +156 @@
                 }
         }
-        var workspace = wizard.getValue("feedWorkspace");
         if(workspace) {
                 t = wizard.getElement("txtWorkspace");
                 t.value = workspace;
         }
-        wizard.setValue("context",context);
         wizard.setButtons([{caption: config.macros.importTiddlers.openLabel, tooltip: config.macros.importTiddlers.openPrompt, onClick: config.macros.importTiddlers.onChooseWorkspace}]);
 };