diff --git a/module/doc/control.php b/module/doc/control.php index 237498eb20..767dc9a469 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -485,7 +485,8 @@ class doc extends control if($objectType == 'module') $table = TABLE_MODULE; $collectors = $this->dao->select('collector')->from($table)->where('id')->eq($objectID)->fetch('collector'); - if(strpos($collectors, ",{$this->app->user->account},") !== false) + $hasCollect = strpos($collectors, ",{$this->app->user->account},") !== false; + if($hasCollect) { $collectors = str_replace(",{$this->app->user->account},", ',', $collectors); } @@ -500,7 +501,7 @@ class doc extends control $this->dao->update($table)->set('collector')->eq($collectors)->where('id')->eq($objectID)->exec(); - die(js::reload('parent')); + $this->send(array('status' => $hasCollect ? 'no' : 'yes')); } /** diff --git a/module/doc/js/common.js b/module/doc/js/common.js index 86ff939890..9c2ad11877 100644 --- a/module/doc/js/common.js +++ b/module/doc/js/common.js @@ -22,7 +22,7 @@ $(document).ready(function() { trigger: '.lib', selector: '.lib', - finish: function() + finish: function() { var orders = {}; var orderNext = 1; @@ -176,4 +176,24 @@ $(document).ready(function() $pageSetting.parent().removeClass('open'); }).on('click', function(e){e.stopPropagation()}); } + + $('.ajaxCollect').mousedown(function (event) { + var obj = $(this); + var url = obj.data('url'); + $.get(url, function(response) + { + if(response.status == 'yes') + { + obj.children('i').removeClass().addClass('icon icon-star text-yellow'); + obj.parent().prev().children('.file-name').children('i').remove('.icon'); + obj.parent().prev().children('.file-name').prepend(' '); + } + else + { + obj.children('i').removeClass().addClass('icon icon-star-empty'); + obj.parent().prev().children('.file-name').children('i').remove(".icon"); + } + }, 'json'); + return false; + }); }); diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index ba792bf159..d1327c1eec 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -90,7 +90,7 @@ var browseType = ''; addedDate, 'm-d h:i');?> editedDate, 'm-d h:i');?> - id&objectType=doc", "", 'hiddenwin', "title='{$collectTitle}' class='btn btn-link'")?> + id&objectType=doc");?>" title="" class='btn btn-link ajaxCollect'> id", "", '', "title='{$lang->edit}' class='btn btn-link'")?> id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php index 2945bb4977..324b1c1213 100644 --- a/module/doc/view/browsebygrid.html.php +++ b/module/doc/view/browsebygrid.html.php @@ -40,7 +40,7 @@
addedBy);?>
- id}&objectType=doc", "", 'hiddenwin', "title='{$collectTitle}' class='btn btn-link'")?> + id}&objectType=doc");?>" title="" class='btn btn-link ajaxCollect'> id}", "", '', "title='{$lang->edit}' class='btn btn-link'")?> id}", "", '', "title='{$lang->delete}' class='btn btn-link'")?>
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php index 857f0d9769..1defbd69d7 100644 --- a/module/doc/view/objectlibs.html.php +++ b/module/doc/view/objectlibs.html.php @@ -39,7 +39,7 @@
- save);?>   + save);?>   cancel, '', "btn close-dropdown");?>
@@ -71,7 +71,7 @@ collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?> collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
- ", 'hiddenwin', "title='{$collectTitle}' class='btn btn-link'")?> + " title="" class='btn btn-link ajaxCollect'> ", '', "title='{$lang->edit}' class='btn btn-link iframe'")?> main)) common::printLink('doc', 'deleteLib', "libID=$libID", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> ", '', "title='{$lang->doc->manageType}' class='btn btn-link'")?>