项目也支持可删除

leenjewel · Sep 21, 2015 · 5fca437 · 5fca437
1 parent a88442f
commit 5fca437
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 12 deletions.
diff --git a/apk.builder/pyMySDKWebFrontEnd/application.py b/apk.builder/pyMySDKWebFrontEnd/application.py
@@ -30,6 +30,7 @@
     (r"/workspace/([^/]*)/?", workspace.WorkspaceHandler),
     (r"/project/([^/]*)/([^/]*)/?", project.ProjectHandler),
     (r"/new/([^/]*)/?", project.NewHandler),
+    (r"/del/([^/]*)/([^/]*)/?", project.DelHandler),
     (r"/build/([^/]*)/([^/]*)/?", build.BuildHandler),
     (r"/build/progress/([^/]*)/([^/]*)/?", build.BuildProgressHandler),
     (r"/download/([^/]*)/([^/]*)/?", download.DownloadHandler),

diff --git a/apk.builder/pyMySDKWebFrontEnd/handler/project.py b/apk.builder/pyMySDKWebFrontEnd/handler/project.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-import os,sys
+import os,sys,shutil
 from ahandler import AHandler
 try :
     import pyMySDKAPKBuilder.workspace
@@ -155,3 +155,18 @@ def post(self, workspace_name) :
         return self.redirect("/workspace/%s"  %(workspace_name))
 
 
+class DelHandler(AHandler) :
+
+    def get(self, workspace_name, project_id) :
+        return self.post(workspace_name, project_id)
+
+
+    def post(self, workspace_name, project_id) :
+        workspace_project = self.get_workspace(workspace_name, project_id)
+        if workspace_project and os.path.exists(workspace_project.context["work_dir"]):
+            if os.path.samefile(workspace_project.context["work_dir"], workspace_project.root) :
+                self.application.del_workspace(workspace_project.root)
+            shutil.rmtree(workspace_project.context["work_dir"])
+        return self.redirect("/workspace/%s"  %(workspace_name))
+
+
diff --git a/apk.builder/pyMySDKWebFrontEnd/templates/ui/projectentry.html b/apk.builder/pyMySDKWebFrontEnd/templates/ui/projectentry.html
@@ -10,16 +10,22 @@ <h3 class="panel-title">{{ entry.name }}</h3>
             </table>
         </div>
         <div class="form-group">
-            <a class="btn btn-default btn-lg" href="/project/{{ entry.rootname() }}/{{ entry.name }}">
+            <a class="btn btn-primary btn-lg form-control" style="height:auto;" href="/build/{{ entry.rootname() }}/{{ entry.name }}">
+                <span class="glyphicon glyphicon-play" aria-hidden="true"></span>
+                <span>Build Project</span>
+            </a>
+        </div>
+        <div class="form-group">
+            <a class="btn btn-success btn-lg form-control" style="height:auto" href="/project/{{ entry.rootname() }}/{{ entry.name }}">
                 <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
                 <span>Edit Project</span>
             </a>
         </div>
         <div class="form-group">
-            <a class="btn btn-default btn-lg" href="/build/{{ entry.rootname() }}/{{ entry.name }}">
-                <span class="glyphicon glyphicon-play-circle" aria-hidden="true"></span>
-                <span>Build Project</span>
-            </a>
+            <div class="btn btn-danger btn-lg form-control" style="height:auto" onclick="mysdkDeleteProject('{{ entry.rootname() }}', '{{ entry.name }}');">
+                <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
+                <span>Delete Project</span>
+            </div>
         </div>
     </div>
 </div>
diff --git a/apk.builder/pyMySDKWebFrontEnd/templates/ui/workspaceentry.html b/apk.builder/pyMySDKWebFrontEnd/templates/ui/workspaceentry.html
@@ -49,7 +49,7 @@ <h3 class="panel-title">{{ entry["name"] }}</h3>
             </form>
             {% if is_create_workspace %}
             <div class="form-group">
-                <button class="btn btn-success btn-lg form-control" style="height:auto;" onclick="mysdkCreateWorkSpace();">
+                <button class="btn btn-default btn-lg form-control" style="height:auto;" onclick="mysdkCreateWorkSpace();">
                     <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
                     <span>New Workspace</span>
                 </button>

diff --git a/apk.builder/pyMySDKWebFrontEnd/templates/workspace.html b/apk.builder/pyMySDKWebFrontEnd/templates/workspace.html
@@ -15,13 +15,21 @@
                     <h3 class="panel-title">New Project</h3>
                 </div>
                 <div class="panel-body">
-                    <a class="btn btn-default btn-lg" href="/new/{{ workspace_name }}">
-                    <span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span>
-                    <span>New Project</span>
-                    </a>
+                    <div class="form-group">
+                        <a class="btn btn-default btn-lg form-control" style="height:auto;" href="/new/{{ workspace_name }}">
+                            <span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span>
+                            <span>New Project</span>
+                        </a>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
-
+<script type="text/javascript">
+function mysdkDeleteProject(workspaceName, projectID) {
+    if (true === confirm("Do you want to delete project ["+projectID+"] ?")) {
+        window.location.href = "/del/" + workspaceName + "/" + projectID;
+    }
+}
+</script>