collections working - remaining - test value display and select all

ushahidi · Nov 13, 2015 · 8737dc0 · 8737dc0
1 parent 00399eb
commit 8737dc0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/app/post/controllers/post-detail-controller.js b/app/post/controllers/post-detail-controller.js
@@ -1,5 +1,6 @@
 module.exports = [
     '$scope',
+    '$rootScope',
     'post',
     '$translate',
     '$q',
@@ -19,6 +20,7 @@ module.exports = [
     'Notify',
 function (
     $scope,
+    $rootScope,
     post,
     $translate,
     $q,
@@ -162,11 +164,18 @@ function (
         });
     };
 
-    $scope.editableCollections = CollectionEndpoint.editableByMe();
+    $scope.refreshCollections = function () {
+      $scope.editableCollections = CollectionEndpoint.editableByMe();
+    };
+    $scope.refreshCollections();
     $scope.postInCollection = function (collection) {
         return _.contains($scope.post.sets, String(collection.id));
     };
 
+    $scope.toggleCreateCollection = function () {
+        $scope.showNewCollectionInput = !$scope.showNewCollectionInput
+    };
+
     $scope.toggleCollection = function (selectedCollection) {
         if (_.contains($scope.post.sets, String(selectedCollection.id))) {
             $scope.removeFromCollection(selectedCollection);
@@ -242,15 +251,10 @@ function (
         CollectionEndpoint.save(collection)
         .$promise
         .then(function (collection) {
-            $translate('notify.collection.created_collection', {collection: collection})
-            .then(function (message) {
-                $scope.addToCollection(collection);
-                $rootScope.$broadcast('event:collection:update');
-                $scope.newCollection = '';
-                $scope.toggleCreateCollection();
-                refreshCollections();
-                Notify.showNotificationSlider(message);
-            });
+            $scope.toggleCreateCollection();
+            $scope.newCollection = '';
+            $scope.refreshCollections();
+            $scope.addToCollection(collection);
         }, function (errorReponse) {
             Notify.showApiErrors(errorResponse);
         });

diff --git a/app/post/directives/post-preview-directive.js b/app/post/directives/post-preview-directive.js
@@ -69,6 +69,8 @@ function (
             scope.newCollection = '';
             scope.getRoleDisplayName = RoleHelper.getRole;
 
+            scope.editableByMeCopy = [];
+
             // Ensure completes stages array is numeric
             scope.post.completed_stages = scope.post.completed_stages.map(function (stageId) {
                 return parseInt(stageId);
@@ -98,6 +100,7 @@ function (
                return 'Everyone';
             };
 
+            // TODO all collection code should be moved into a separate standalone widget
             scope.postInCollection = function (collection) {
                 return _.contains(scope.post.sets, String(collection.id));
             };
@@ -139,17 +142,21 @@ function (
                     Notify.showApiErrors(errorResponse); 
                 });
             };
-
+/*
             scope.searchCollections = function (query) {
                 CollectionEndpoint.query(query)
                 .$promise
-                .then(function (collection) {
-
+                .then(function (result) {
+                   scope. 
                 }, function (errorResponse) {
                     Notify.showApiErrors(errorResponse); 
                 });
             };
 
+            scope.clearSearch = function() {
+              scope.editableCollection = scope.editableCollectionCopy;
+            };
+*/
             scope.createNewCollection = function (collectionName) {
                 var collection = {
                   'name': collectionName,