release 2.9.6

xjsender · May 20, 2015 · 11f2f85 · 11f2f85
1 parent 0aacac4
commit 11f2f85
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 21 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -9,6 +9,7 @@ Release 2.9.6 (2015-05-20)
 ++++++++++++++++++
 * Bug Fix:
     - Fix issue #33
+    - Fix issue #35
 
 * Enhancement:
     - Add required check for XML utilities
@@ -23,6 +24,7 @@ Release 2.9.6 (2015-05-20)
 
 * Update
     - Because metadata.json of every project is stable, so save it into ``metadata.sublime-settings`` but not ``.config/metdata.json`` again
+    - Remove ``check_workspace_available`` for export feature, because this check is useless
 
 
 Release 2.9.5 (2015-05-16)

diff --git a/config/commands/main.sublime-commands b/config/commands/main.sublime-commands
@@ -26,7 +26,12 @@
 
     {
         "caption": "HaoIDE: New Project",
-        "command": "create_new_project"
+        "command": "describe_metadata",
+        "args": {
+            "callback_options": {
+                "callback_command": "create_new_project"
+            }
+        }
     },
 
     {

diff --git a/config/keymap/Default (Linux).sublime-keymap b/config/keymap/Default (Linux).sublime-keymap
@@ -14,7 +14,12 @@
     // Download all code and save them to new project
     {
         "keys": ["alt+f5"], 
-        "command": "create_new_project"
+        "command": "describe_metadata",
+        "args": {
+            "callback_options": {
+                "callback_command": "create_new_project"
+            }
+        }
     },
 
     // Update the default project    

diff --git a/config/keymap/Default (OSX).sublime-keymap b/config/keymap/Default (OSX).sublime-keymap
@@ -14,7 +14,12 @@
     // Download all code and save them to new project
     {
         "keys": ["super+alt+n"], 
-        "command": "create_new_project"
+        "command": "describe_metadata",
+        "args": {
+            "callback_options": {
+                "callback_command": "create_new_project"
+            }
+        }
     },
 
     // Update the default project

diff --git a/config/keymap/Default (Windows).sublime-keymap b/config/keymap/Default (Windows).sublime-keymap
@@ -14,7 +14,12 @@
     // Download all code and save them to new project
     {
         "keys": ["ctrl+alt+n"], 
-        "command": "create_new_project"
+        "command": "describe_metadata",
+        "args": {
+            "callback_options": {
+                "callback_command": "create_new_project"
+            }
+        }
     },
 
     // Update the default project 

diff --git a/config/menus/Main.sublime-menu b/config/menus/Main.sublime-menu
@@ -21,7 +21,12 @@
                 "children": [
                     {
                         "caption": "New Project",
-                        "command": "create_new_project"
+                        "command": "describe_metadata",
+                        "args": {
+                            "callback_options": {
+                                "callback_command": "create_new_project"
+                            }
+                        }
                     },
 
                     {"caption": "-"},

diff --git a/config/messages/2.9.6.md b/config/messages/2.9.6.md
@@ -18,6 +18,7 @@ Release Date: 20 May 2015
 
 * Update
     - Because metadata.json of every project is stable, so save it into ``metadata.sublime-settings`` but not ``.config/metdata.json`` again
+    - Remove ``check_workspace_available`` for export feature, because this check is useless
 
 * Notes: 
     - You should restart your sublime after ``HaoIDE`` is upgraded

diff --git a/main.py b/main.py
@@ -475,7 +475,6 @@ def on_done(self, index):
         recordtype_id = self.sobject_recordtypes_attr[sobject_recordtype]
 
         # handle this describe request
-        util.check_workspace_available()
         processor.handle_export_data_template_thread(sobject, recordtype_name, recordtype_id)
 
     def is_enabled(self):
@@ -1014,7 +1013,6 @@ def __init__(self, *args, **kwargs):
         super(ExportCustomFieldCommand, self).__init__(*args, **kwargs)
 
     def run(self):
-        util.check_workspace_available()
         processor.handle_export_customfield()
 
     def is_enabled(self):
@@ -1045,7 +1043,6 @@ def on_input(self, input):
         # Display the fields in a new view
         input = input.replace(" ", "")
 
-        util.check_workspace_available()
         if input == "*":
             processor.handle_export_all_workbooks(5)
         else:

diff --git a/util.py b/util.py
@@ -646,19 +646,6 @@ def check_action_enabled():
     # Check whether describe_metadata request is finished
     described_metadata = get_described_metadata(settings["username"])
     return described_metadata is not None
-
-def check_workspace_available(settings=None):
-    """Check workspace is available, if not make it
-
-    Arguments:
-
-    * settings -- settings of this plugin
-    """
-    if not settings: settings = context.get_settings()
-    if not os.path.exists(settings["workspace"]):
-        sublime.active_window().run_command('create_new_project', {
-            "switch_project": False
-        })
 
 def get_view_by_name(view_name):
     """Get view by view name