From bad90b1df3f5c62369de3db14154ec24d6f8e21c Mon Sep 17 00:00:00 2001 From: xia0ta0 Date: Wed, 31 Jul 2013 09:00:40 +0800 Subject: [PATCH 1/5] * code for task#1657. --- module/doc/js/browse.js | 32 ++++++++++++++++++++++++++++++++ module/doc/view/browse.html.php | 8 +++++--- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/module/doc/js/browse.js b/module/doc/js/browse.js index b6a7404ab5..8e37fb28db 100644 --- a/module/doc/js/browse.js +++ b/module/doc/js/browse.js @@ -27,3 +27,35 @@ $(function(){ browseBySearch(); } }); + +/** + * Delete doc. + * + * @param int $docID + * @access public + * @return void + */ +function deleteDoc(docID) +{ + if(confirm(confirmDelete)) + { + url = createLink('doc', 'delete','docID=' + docID + '&confrim=yes'); + $.ajax( + { + type: 'GET', + url: url, + dataType: 'json', + success: function(data) + { + if(data.result == 'success') + { + $('#docbox').load(request + ' #doclist', function() + { + $('.colored').colorize(); + $('tfoot td').css('background', 'white').unbind('click').unbind('hover'); + }); + } + } + }); + } +} diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index 4b90f11ef8..117e664434 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -14,6 +14,8 @@ +doc->confirmDelete)?> +app->getURI(true))?> @@ -41,8 +43,8 @@ var browseType = ''; - - +
+ recTotal}&recPerPage={$pager->recPerPage}";?> @@ -70,7 +72,7 @@ var browseType = ''; id}"; common::printIcon('doc', 'edit', $vars, '', 'list'); - common::printIcon('doc', 'delete', $vars, '', 'list', '', 'hiddenwin'); + echo html::a("javascript:deleteDoc($doc->id)", ' ', '', "class='icon-green-common-delete' title='{$lang->doc->delete}'"); ?> From 60efdc517478c7f28b3c8f9fb347d1880cb5f008 Mon Sep 17 00:00:00 2001 From: xia0ta0 Date: Wed, 31 Jul 2013 09:40:02 +0800 Subject: [PATCH 2/5] * code for task#1657. --- module/release/control.php | 10 +++++++++- module/release/js/browse.js | 28 ++++++++++++++++++++++++++++ module/release/view/browse.html.php | 6 ++++-- 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 module/release/js/browse.js diff --git a/module/release/control.php b/module/release/control.php index a3190c3b35..253b3dcc8a 100644 --- a/module/release/control.php +++ b/module/release/control.php @@ -177,8 +177,16 @@ class release extends control } else { + $response['result'] = 'success'; + $response['message'] = ''; + $this->release->delete(TABLE_RELEASE, $releaseID); - die(js::locate($this->session->releaseList, 'parent')); + if(dao::isError()) + { + $response['result'] = 'fail'; + $response['message'] = dao::getError(); + } + $this->send($response); } } diff --git a/module/release/js/browse.js b/module/release/js/browse.js new file mode 100644 index 0000000000..595558edc3 --- /dev/null +++ b/module/release/js/browse.js @@ -0,0 +1,28 @@ +/** + * Delete release. + * + * @param int releaseID + * @access public + * @return void + */ +function deleteRelease(releaseID) +{ + if(confirm(confirmDelete)) + { + url = createLink('release', 'delete','releaseID=' + releaseID + '&confrim=yes'); + $.ajax( + { + type: 'GET', + url: url, + dataType: 'json', + success: function(data) + { + if(data.result == 'success') + { + url = createLink('release', 'browse', 'productID=' + productID); + $('.outer').load(url + ' #releaselist', function(){sortTable();}); + } + } + }); + } +} diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index 1f43d44520..6a4681ca06 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -12,7 +12,9 @@ ?> -
+id)?> +release->confirmDelete)?> +
From 00586a2b395f2cd473a7aecd9d86054b256b024c Mon Sep 17 00:00:00 2001 From: xia0ta0 Date: Wed, 31 Jul 2013 10:13:35 +0800 Subject: [PATCH 3/5] * code for task#1657. --- module/product/js/doc.js | 28 ++++++++++++++++++++++++++++ module/product/view/doc.html.php | 9 +++++---- 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 module/product/js/doc.js diff --git a/module/product/js/doc.js b/module/product/js/doc.js new file mode 100644 index 0000000000..e9df54bd07 --- /dev/null +++ b/module/product/js/doc.js @@ -0,0 +1,28 @@ +/** + * Delete doc. + * + * @param int $docID + * @access public + * @return void + */ +function deleteDoc(docID) +{ + if(confirm(confirmDelete)) + { + url = createLink('doc', 'delete','docID=' + docID + '&confrim=yes'); + $.ajax( + { + type: 'GET', + url: url, + dataType: 'json', + success: function(data) + { + if(data.result == 'success') + { + url = createLink('product', 'doc', 'productID=' + productID); + $('.outer').load(url + ' #doclist', function(){sortTable();}); + } + } + }); + } +} diff --git a/module/product/view/doc.html.php b/module/product/view/doc.html.php index b197c81106..6a59a7d046 100644 --- a/module/product/view/doc.html.php +++ b/module/product/view/doc.html.php @@ -13,9 +13,11 @@ +doc->confirmDelete)?> +id)?>
-
release->browse;?>
id");?>
@@ -36,7 +38,7 @@
id", '', 'list'); - common::printIcon('release', 'delete', "release=$release->id", '', 'list', '', 'hiddenwin'); + echo html::a("javascript:deleteRelease($release->id)", ' ', '', "class='icon-green-common-delete' title='{$lang->release->delete}'"); ?>
+
@@ -41,9 +43,8 @@ From 44376ef1d1eb60dfc60fcf6ca554149e4b2ff856 Mon Sep 17 00:00:00 2001 From: xia0ta0 Date: Wed, 31 Jul 2013 10:28:37 +0800 Subject: [PATCH 4/5] * code for task#1657. --- module/my/js/todo.js | 33 ++++++++++++++++++++++++++++++++ module/my/view/todo.html.php | 5 ++++- module/my/view/todolist.html.php | 2 +- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/module/my/js/todo.js b/module/my/js/todo.js index a3a789eb21..9ce579181e 100644 --- a/module/my/js/todo.js +++ b/module/my/js/todo.js @@ -20,4 +20,37 @@ function changeAction(formName, actionName, actionLink) $('#' + formName).attr('action', actionLink).submit(); } +/** + * Delete todo. + * + * @param int todoID + * @access public + * @return void + */ +function deleteTodo(todoID) +{ + if(confirm(confirmDelete)) + { + url = createLink('todo', 'delete','todoID=' + todoID + '&confrim=yes'); + $.ajax( + { + type: 'GET', + url: url, + dataType: 'json', + success: function(data) + { + if(data.result == 'success') + { + url = createLink('my', 'todo'); + $('#todo').load(url + ' #todoList', function() + { + $('.colored').colorize(); + $('tfoot td').css('background', 'white').unbind('click').unbind('hover'); + }); + } + } + }); + } +} + $(".colorbox").colorbox({width:960, height:550, iframe:true, transition:'none'}); diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index b09db9ac73..754c9c8f10 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -14,6 +14,7 @@ +todo->confirmDelete)?>
@@ -48,7 +49,9 @@ ?>
- +
+ +
diff --git a/module/my/view/todolist.html.php b/module/my/view/todolist.html.php index 3c4881f51b..d7fcc5bafb 100644 --- a/module/my/view/todolist.html.php +++ b/module/my/view/todolist.html.php @@ -33,7 +33,7 @@ id", $todo, 'list', '', 'hiddenwin'); common::printIcon('todo', 'edit', "id=$todo->id", '', 'list', '', '', 'iframe', true); - common::printIcon('todo', 'delete', "id=$todo->id", '', 'list', '', 'hiddenwin'); + echo html::a("javascript:deleteTodo($todo->id)", ' ', '', "class='icon-green-common-delete' title='{$lang->todo->delete}'"); ?> From 8a7f3b5bcdbdb9f7cd357e6418c7123be12df9cc Mon Sep 17 00:00:00 2001 From: xia0ta0 Date: Wed, 31 Jul 2013 10:29:00 +0800 Subject: [PATCH 5/5] * code for task#1657. --- module/todo/control.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/module/todo/control.php b/module/todo/control.php index eb80abf7ba..2221c9d4ee 100644 --- a/module/todo/control.php +++ b/module/todo/control.php @@ -278,9 +278,18 @@ class todo extends control } else { + $response['result'] = 'success'; + $response['message'] = ''; + $this->dao->delete()->from(TABLE_TODO)->where('id')->eq($todoID)->exec(); + if(dao::isError()) + { + $response['result'] = 'fail'; + $response['message'] = dao::getError(); + } + $this->loadModel('action')->create('todo', $todoID, 'erased'); - die(js::locate($this->session->todoList, 'parent')); + $this->send($response); } }
id}&projectID=0&from=product");?>
addedDate;?> id}"; - common::printIcon('doc', 'edit', $vars); - common::printIcon('doc', 'delete', $vars, '', 'button', '', 'hiddenwin'); + common::printIcon('doc', 'edit', "doc={$doc->id}"); + echo html::a("javascript:deleteDoc($doc->id)", ' ', '', "class='icon-green-common-delete' title='{$lang->doc->delete}'"); ?>