star7th 7 rokov pred
rodič
commit
522df67388

+ 2 - 2
Application/Home/View/Item/show_regular.html

@@ -125,7 +125,7 @@
                 <!-- dropdown menu links -->
                   <li><a href="" id="copy-link" title="{$Think.Lang.copy_interface_to_new}">{$Think.Lang.copy}</a></li>
                   <li><a href="" data-page_id= "0" class="show_page_info" title="详情">详情</a></li>
-                  <li><a href="" title="{$Think.Lang.delete_interface}" onclick="return confirm('{$Think.Lang.comfirm_delete}');return false;" id="delete-link">{$Think.Lang.delete}</a></li>
+                  <li><a href="" title="{$Think.Lang.delete_interface}"  id="delete-link">{$Think.Lang.delete}</a></li>
 
                 </ul>
               </div>
@@ -184,4 +184,4 @@
 <script src="__PUBLIC__/js/jquery.hotkeys.js"></script>
 <script src="__PUBLIC__/jquery.zclip/jquery.zclip.js"></script>
 
-<script src="__PUBLIC__/js/item/show.js?v=1.21212345678901234567"></script>
+<script src="__PUBLIC__/js/item/show.js?v=1.212123456789012345678"></script>

+ 64 - 6
Public/js/item/show.js

@@ -146,7 +146,7 @@ $(function(){
       //$("#page-content").attr("src" , iframe_url);
       $("#edit-link").attr("href" , base_url+"/home/page/edit/page_id/"+page_id);
       $("#copy-link").attr("href" , base_url+"/home/page/edit/item_id/"+item_id+"/copy_page_id/"+page_id);
-      $("#delete-link").attr("href" , base_url+"/home/page/delete/page_id/"+page_id);
+      $("#delete-link").data("page_id",page_id);
       
       var domain = item_domain ? item_domain : item_id ;
       var cur_page_url =  window.location.protocol +"//"+window.location.host+base_url+"/"+domain;
@@ -249,8 +249,7 @@ function iFrameHeight() { 
     },
     // 删除
     "Ctrl+D": function() {
-      if (confirm(lang["confirm_to_delete"]))
-        location.href = $("#delete-link").attr('href');
+      $("#delete-link").click();
     },
     // 新建页面
     "Ctrl+F1": function() {
@@ -287,9 +286,68 @@ function iFrameHeight() { 
       );
     return false;
   });
-  
-  //监听来自iframe的消息。如果传递图片url过来则默认打开之
-  window.addEventListener('message', function(e){
+
+  //删除页面
+  $("#delete-link").click(function(){
+    var page_id =  $(this).data("page_id") ;
+    $.confirm(lang["confirm_to_delete"],{},function(){
+      $.post(
+        DocConfig.server+"/api/page/delete",
+        {"page_id":page_id},
+        function(data){
+                  if (data.error_code == 0) {
+                    $.alert(lang["delete_success"],function(){
+                      window.location.reload();
+                    });
+                    
+                  }else{
+                    if (data.error_message) {
+                      $.alert(data.error_message);
+                    }else{
+                      $.alert(lang["delete_fail"]);
+                    }
+                    
+                  }
+          
+        },
+        "json"
+
+        );
+    });
+
+    return false;
+  });
+
+  $("#delete-link").click(function(){
+    var page_id =  $(this).data("page_id") ;
+    $.confirm(lang["confirm_to_delete"],{},function(){
+      $.post(
+        DocConfig.server+"/api/page/delete",
+        {"page_id":page_id},
+        function(data){
+                  if (data.error_code == 0) {
+                    $.alert(lang["delete_success"],function(){
+                      window.location.reload();
+                    });
+                    
+                  }else{
+                    if (data.error_message) {
+                      $.alert(data.error_message);
+                    }else{
+                      $.alert(lang["delete_fail"]);
+                    }
+                    
+                  }
+          
+        },
+        "json"
+
+        );
+    });
+
+    return false;
+  });
+    window.addEventListener('message', function(e){
       if(e.origin != window.location.origin) return;
       if (e.data.meessage_type != 'img_url') {
         return ;

+ 23 - 0
server/Application/Api/Controller/PageController.class.php

@@ -19,5 +19,28 @@ class PageController extends BaseController {
         }
         $this->sendResult($page);
     }
+    //删除页面
+    public function delete(){
+        $page_id = I("page_id/d")? I("page_id/d") : 0;
+        $page = D("Page")->where(" page_id = '$page_id' ")->find();
 
+        $login_user = $this->checkLogin();
+        if (!$this->checkItemCreator($login_user['uid'] , $page['item_id']) && $login_user['uid'] != $page['author_uid']) {
+            $this->sendError(10303);
+            return ;
+        }
+
+        if ($page) {
+            
+            $ret = D("Page")->where(" page_id = '$page_id' ")->delete();
+            //更新项目时间
+            D("Item")->where(" item_id = '$page[item_id]' ")->save(array("last_update_time"=>time()));
+
+        }
+        if ($ret) {
+           $this->sendResult(array());
+        }else{
+           $this->sendError(10101);
+        }
+    }
 }