More fixes

controller/sharecontroller.php

@@ -29,17 +29,17 @@ class ShareController extends Controller {
     public function searchUser($search) {
         $limit = null;
         $offset = null;
+        $result = [];
         $groups = [];
         foreach ($this->groupManager->search($search, $limit, $offset) as $group) {
             $groups[] = $group->getGID();
+            $result[] = array('type'=>'group', 'id'=>$group->getGID());
         }
         $users = [];
         foreach ($this->userManager->searchDisplayName($search, $limit, $offset) as $user) {
             $users[] = $user->getDisplayName();
+            $result[] = array('type'=>'group', 'id'=>$user->getUID(), 'displayName'=>$user->getDisplayName());
         }
-        return array(
+        return $result;
-            'users' => $users,
-            'groups' => $groups
-        );
     }
 }

img/app.svg

@@ -1,77 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
-<svg
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-   xmlns:cc="http://creativecommons.org/ns#"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+<style type="text/css">
-   xmlns:svg="http://www.w3.org/2000/svg"
+	.st0{fill:#FFFFFF;}
-   xmlns="http://www.w3.org/2000/svg"
+</style>
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+<path class="st0" d="M163,144H80c-6.6,0-12-5.4-12-12V80c0-6.6,5.4-12,12-12h83c6.6,0,12,5.4,12,12v52C175,138.6,169.6,144,163,144z
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+	"/>
-   height="32"
+<path class="st0" d="M163,244.3H80c-6.6,0-12-5.4-12-12v-52c0-6.6,5.4-12,12-12h83c6.6,0,12,5.4,12,12v52
-   width="32"
+	C175,238.9,169.6,244.3,163,244.3z"/>
-   version="1.0"
+<path class="st0" d="M163,344.6H80c-6.6,0-12-5.4-12-12v-52c0-6.6,5.4-12,12-12h83c6.6,0,12,5.4,12,12v52
-   id="svg2"
+	C175,339.2,169.6,344.6,163,344.6z"/>
-   inkscape:version="0.91 r13725"
+<path class="st0" d="M163,444H80c-6.6,0-12-5.4-12-12v-52c0-6.6,5.4-12,12-12h83c6.6,0,12,5.4,12,12v52C175,438.6,169.6,444,163,444
-   sodipodi:docname="app.svg">
+	z"/>
-  <metadata
+<path class="st0" d="M432,144h-83c-6.6,0-12-5.4-12-12V80c0-6.6,5.4-12,12-12h83c6.6,0,12,5.4,12,12v52C444,138.6,438.6,144,432,144
-     id="metadata10">
+	z"/>
-    <rdf:RDF>
+<path class="st0" d="M432,244.3h-83c-6.6,0-12-5.4-12-12v-52c0-6.6,5.4-12,12-12h83c6.6,0,12,5.4,12,12v52
-      <cc:Work
+	C444,238.9,438.6,244.3,432,244.3z"/>
-         rdf:about="">
+<path class="st0" d="M432,344.6h-83c-6.6,0-12-5.4-12-12v-52c0-6.6,5.4-12,12-12h83c6.6,0,12,5.4,12,12v52
-        <dc:format>image/svg+xml</dc:format>
+	C444,339.2,438.6,344.6,432,344.6z"/>
-        <dc:type
+<path class="st0" d="M296.5,144h-83c-6.6,0-12-5.4-12-12V80c0-6.6,5.4-12,12-12h83c6.6,0,12,5.4,12,12v52
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+	C308.5,138.6,303.1,144,296.5,144z"/>
-      </cc:Work>
+<path class="st0" d="M296.5,244.3h-83c-6.6,0-12-5.4-12-12v-52c0-6.6,5.4-12,12-12h83c6.6,0,12,5.4,12,12v52
-    </rdf:RDF>
+	C308.5,238.9,303.1,244.3,296.5,244.3z"/>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1918"
-     inkscape:window-height="1038"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="59"
-     inkscape:cx="11.86676"
-     inkscape:cy="24.013007"
-     inkscape:window-x="0"
-     inkscape:window-y="18"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       position="14.381833,30.201849"
-       orientation="0,1"
-       id="guide4217" />
-  </sodipodi:namedview>
-  <rect
-     style="fill:#ffffff;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
-     id="rect4185"
-     width="8.0941048"
-     height="28.188393"
-     x="1.5340621"
-     y="1.7921587" />
-  <rect
-     style="fill:#ffffff;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
-     id="rect4185-0"
-     width="8.0941048"
-     height="19.655172"
-     x="12.130231"
-     y="1.8042486" />
-  <rect
-     style="fill:#ffffff;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
-     id="rect4185-0-1"
-     width="8.0941048"
-     height="24.065601"
-     x="22.525743"
-     y="1.7981508" />
 </svg>

js/app/App.js

@@ -26,3 +26,7 @@ var app = angular.module('Deck', [
 	'ngAnimate'
 ]);
 
+$('link[rel="shortcut icon"]').attr(
+	'href',
+	OC.filePath('deck', 'img', 'app-512.png')
+);

js/controller/BoardController.js

@@ -28,6 +28,8 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
     $scope.statusservice.setError('Error occured', error);
   });
 
+  BoardService.searchUsers();
+  console.log(BoardService.sharees);
   BoardService.fetchOne($scope.id).then(function(data) {
 
     $scope.statusservice.releaseWaiting();

js/public/app.js

@@ -27,6 +27,10 @@ var app = angular.module('Deck', [
 	'ngAnimate'
 ]);
 
+$('link[rel="shortcut icon"]').attr(
+	'href',
+	OC.filePath('deck', 'img', 'app-512.png')
+);
 
 app.config(["$provide", "$routeProvider", "$interpolateProvider", "$httpProvider", "$urlRouterProvider", "$stateProvider", "$compileProvider", function ($provide, $routeProvider, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider) {
     'use strict';
@@ -130,6 +134,8 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
     $scope.statusservice.setError('Error occured', error);
   });
 
+  BoardService.searchUsers();
+  console.log(BoardService.sharees);
   BoardService.fetchOne($scope.id).then(function(data) {
 
     $scope.statusservice.releaseWaiting();
@@ -628,6 +634,22 @@ app.factory('BoardService', ["ApiService", "$http", "$q", function(ApiService, $
         ApiService.call(this, $http, ep, $q);
     };
     BoardService.prototype = angular.copy(ApiService.prototype);
+
+    BoardService.prototype.searchUsers = function() {
+        var url = OC.generateUrl('/apps/deck/share/search/%');
+        var deferred = $q.defer();
+        var self = this;
+        this.sharees = [];
+        $http.get(url).then(function (response) {
+            self.sharees = response.data.users;
+            console.log(this.sharees);
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Error while update ' + self.endpoint);
+        });
+        return deferred.promise;
+    }
+
     service = new BoardService($http, 'boards', $q)
     return service;
 }]);

js/service/BoardService.js

@@ -3,6 +3,22 @@ app.factory('BoardService', function(ApiService, $http, $q){
         ApiService.call(this, $http, ep, $q);
     };
     BoardService.prototype = angular.copy(ApiService.prototype);
+
+    BoardService.prototype.searchUsers = function() {
+        var url = OC.generateUrl('/apps/deck/share/search/%');
+        var deferred = $q.defer();
+        var self = this;
+        this.sharees = [];
+        $http.get(url).then(function (response) {
+            self.sharees = response.data.users;
+            console.log(this.sharees);
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Error while update ' + self.endpoint);
+        });
+        return deferred.promise;
+    }
+
     service = new BoardService($http, 'boards', $q)
     return service;
 });

templates/part.board.sidebarView.php

@@ -17,7 +17,15 @@
 </ul>
 <div class="tabsContainer">
     <div id="commentsTabView" class="tab commentsTabView" ng-if="status.boardtab==0 || !status.boardtab">
-        <input class="shareWithField ui-autocomplete-input" type="text" placeholder="Mit Benutzern, Gruppen oder entfernten Benutzern teilen…" autocomplete="off">
+
+        <ui-select multiple tagging="" ng-model="board.sharees" theme="bootstrap" style="width:100%;" title="Choose a user to assign" placeholder="Assign users ..."
+                   on-select="userAssign($item, $model)" on-remove="userRemove($item, $model)">
+            <ui-select-match placeholder="Select users...">{{$item.id}}</ui-select-match>
+            <ui-select-choices repeat="sharee in boardservice.sharees | filter: $select.search track by $index">
+                <span><i class="fa fa-{{sharee.type}}"></i> {{ sharee.id }}</span>
+            </ui-select-choices>
+        </ui-select>
+
         <ul id="shareWithList" class="shareWithList">
             <li data-share-id="57" data-share-type="0" data-share-with="directmenu">
                 <a href="#" class="unshare"><span class="icon-loading-small"></span><span class="icon icon-delete"><br /></span><span class="hidden-visually">Freigabe aufheben</span></a>