mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

First list tags the user used lately 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2016-10-27 12:26:02 +02:00
parent 1857e50259
commit dc5c7d2b04
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
5 changed files with 150 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/SystemTag/SystemTagsObjectMappingCollection.php
View File

@ -192,7 +192,7 @@ class SystemTagsObjectMappingCollection implements ICollection {
*
* @param ISystemTag $tag
*
* @return SystemTagNode
* @return SystemTagMappingNode
*/
private function makeNode(ISystemTag $tag) {
return new SystemTagMappingNode(

28
apps/systemtags/appinfo/routes.php Normal file
View File

@ -0,0 +1,28 @@
<?php
/**
* @copyright Copyright (c) 2016, Joas Schilling <coding@schilljs.com>
*
* @author Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
return [
'routes' => [
['name' => 'LastUsed#getLastUsedTagIds', 'url' => '/lastused', 'verb' => 'GET'],
]
];

32
apps/systemtags/lib/Activity/Listener.php
View File

@ -28,6 +28,7 @@ use OCP\App\IAppManager;
use OCP\Files\Config\IMountProviderCollection;
use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\IConfig;
use OCP\IGroup;
use OCP\IGroupManager;
use OCP\IUser;
@ -46,6 +47,8 @@ class Listener {
protected $activityManager;
/** @var IUserSession */
protected $session;
/** @var IConfig */
protected $config;
/** @var \OCP\SystemTag\ISystemTagManager */
protected $tagManager;
/** @var \OCP\App\IAppManager */
@ -61,6 +64,7 @@ class Listener {
* @param IGroupManager $groupManager
* @param IManager $activityManager
* @param IUserSession $session
* @param IConfig $config
* @param ISystemTagManager $tagManager
* @param IAppManager $appManager
* @param IMountProviderCollection $mountCollection
@ -69,6 +73,7 @@ class Listener {
public function __construct(IGroupManager $groupManager,
IManager $activityManager,
IUserSession $session,
IConfig $config,
ISystemTagManager $tagManager,
IAppManager $appManager,
IMountProviderCollection $mountCollection,
@ -76,6 +81,7 @@ class Listener {
$this->groupManager = $groupManager;
$this->activityManager = $activityManager;
$this->session = $session;
$this->config = $config;
$this->tagManager = $tagManager;
$this->appManager = $appManager;
$this->mountCollection = $mountCollection;
@ -124,6 +130,11 @@ class Listener {
$this->activityManager->publish($activity);
}
}
if ($actor !== '' && ($event->getEvent() === ManagerEvent::EVENT_CREATE || $event->getEvent() === ManagerEvent::EVENT_UPDATE)) {
$this->updateLastUsedTags($actor, $event->getTag());
}
}
/**
@ -211,6 +222,27 @@ class Listener {
$this->activityManager->publish($activity);
}
}
if ($actor !== '' && $event->getEvent() === MapperEvent::EVENT_ASSIGN) {
foreach ($tags as $tag) {
$this->updateLastUsedTags($actor, $tag);
}
}
}
/**
* @param string $actor
* @param ISystemTag $tag
*/
protected function updateLastUsedTags($actor, ISystemTag $tag) {
$lastUsedTags = $this->config->getUserValue($actor, 'systemtags', 'last_used', '[]');
$lastUsedTags = json_decode($lastUsedTags, true);
array_unshift($lastUsedTags, $tag->getId());
array_unique($lastUsedTags);
$lastUsedTags = array_slice($lastUsedTags, 0, 10);
$this->config->setUserValue($actor, 'systemtags', 'last_used', json_encode($lastUsedTags));
}
/**

59
apps/systemtags/lib/Controller/LastUsedController.php Normal file
View File

@ -0,0 +1,59 @@
<?php
/**
* @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\SystemTags\Controller;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\DataResponse;
use OCP\IConfig;
use OCP\IRequest;
use OCP\IUserSession;
class LastUsedController extends Controller {
/** @var IConfig */
protected $config;
/** @var IUserSession */
protected $userSession;
/**
* @param string $appName
* @param IRequest $request
* @param IConfig $config
* @param IUserSession $userSession
*/
public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) {
parent::__construct($appName, $request);
$this->config = $config;
$this->userSession = $userSession;
}
/**
* @NoAdminRequired
*/
public function getLastUsedTagIds() {
$lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]');
$tagIds = json_decode($lastUsed, true);
return new DataResponse(array_map(function($id) { return (string) $id; }, $tagIds));
}
}

30
core/js/systemtags/systemtagsinputfield.js
View File

@ -57,6 +57,8 @@
_newTag: null,
_lastUsedTags: [],
className: 'systemTagsInputFieldContainer',
template: function(data) {
@ -97,6 +99,8 @@
_.defer(self._refreshSelection);
});
_.defer(_.bind(this._getLastUsedTags, this));
_.bindAll(
this,
'_refreshSelection',
@ -108,6 +112,17 @@
);
},
_getLastUsedTags: function() {
var self = this;
$.ajax({
type: 'GET',
url: OC.generateUrl('/apps/systemtags/lastused'),
success: function (response) {
self._lastUsedTags = response;
}
});
},
/**
* Refreshes the selection, triggering a call to
* select2's initSelection
@ -241,6 +256,7 @@
}
this._newTag = null;
this.trigger('select', tag);
this._lastUsedTags.unshift(tag.id);
},
/**
@ -400,6 +416,20 @@
var aSelected = selectedItems.indexOf(a.id) >= 0;
var bSelected = selectedItems.indexOf(b.id) >= 0;
if (aSelected === bSelected) {
var aLastUsed = self._lastUsedTags.indexOf(a.id);
var bLastUsed = self._lastUsedTags.indexOf(b.id);
if (aLastUsed !== bLastUsed) {
if (bLastUsed === -1) {
return -1;
}
if (aLastUsed === -1) {
return 1;
}
return aLastUsed < bLastUsed ? -1 : 1;
}
// Both not found
return OC.Util.naturalSortCompare(a.name, b.name);
}
if (aSelected && !bSelected) {