From fe8b665f3c43058a13caf3f1289ff4f5bf3b6441 Mon Sep 17 00:00:00 2001
From: will <will.doran@riseup.net>
Date: Mon, 4 Jul 2016 10:19:06 -0400
Subject: [PATCH 01/12] fixed incorrect translation key

---
 app/setting/controllers/setting-categories-create-controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/setting/controllers/setting-categories-create-controller.js b/app/setting/controllers/setting-categories-create-controller.js
index cd809f2bc3..3b9e9f4f12 100644
--- a/app/setting/controllers/setting-categories-create-controller.js
+++ b/app/setting/controllers/setting-categories-create-controller.js
@@ -48,7 +48,7 @@ function (
 
         TagEndpoint.saveCache(category).$promise.then(function (response) {
             if (response.id) {
-                Notify.notify('notify.tag.save_success', { name: category.tag });
+                Notify.notify('notify.category.save_success', { name: category.tag });
                 addAnother ? $route.reload() : $location.path(whereToNext);
             }
         }, function (errorResponse) { // error

From da735fc6e5642885780a556cfe2b8c116a6a744f Mon Sep 17 00:00:00 2001
From: will <will.doran@riseup.net>
Date: Mon, 4 Jul 2016 10:33:41 -0400
Subject: [PATCH 02/12] Category label should be hidden when there are no
 actegories to select from

---
 server/www/templates/posts/modify/post-tabs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/www/templates/posts/modify/post-tabs.html b/server/www/templates/posts/modify/post-tabs.html
index 87e705d83c..3df4e698a4 100644
--- a/server/www/templates/posts/modify/post-tabs.html
+++ b/server/www/templates/posts/modify/post-tabs.html
@@ -55,7 +55,7 @@
             </div>
         </div>
 
-        <fieldset id="categories" ng-show="isFirstStage(visibleStage)">
+        <fieldset id="categories" ng-show="isFirstStage(visibleStage) && categories.length">
             <legend translate="post.modify.form.categories">Categories</legend>
             <div class="form-field checkbox" ng-repeat="category in categories">
                 <label for="cat1">

From d14774802cf5ba2267c2e13534b2d08f5822937c Mon Sep 17 00:00:00 2001
From: Jason Mule <jason.mule@gmail.com>
Date: Mon, 4 Jul 2016 19:41:22 +0300
Subject: [PATCH 03/12] Hide nested options in until parent is selected

---
 app/common/directives/publish-selector.js                | 3 +++
 .../common/publish-selector/publish-selector.html        | 9 ++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/common/directives/publish-selector.js b/app/common/directives/publish-selector.js
index 190dd913bb..f3f4c6754a 100644
--- a/app/common/directives/publish-selector.js
+++ b/app/common/directives/publish-selector.js
@@ -53,6 +53,9 @@ function (
 
             };
 
+            $scope.toggleRolesView = function () {
+                $scope.showRoles = true;
+            };
         }];
     return {
         restrict: 'E',
diff --git a/server/www/templates/common/publish-selector/publish-selector.html b/server/www/templates/common/publish-selector/publish-selector.html
index 021cd8938e..da5eec198a 100644
--- a/server/www/templates/common/publish-selector/publish-selector.html
+++ b/server/www/templates/common/publish-selector/publish-selector.html
@@ -13,7 +13,7 @@
       </svg>
     </legend>
     <div class="dropdown-menu init" dropdown-menu>
-        <div class="form-fieldgroup">
+        <div class="form-fieldgroup" dropdown>
             <div class="form-field radio">
                 <input
                     name="{{post.id}}_draft"
@@ -35,14 +35,13 @@
                     ng-click="toggleRole('')">
                 <label for="{{post.id}}_everyone" translate="post.everyone">Everyone</label>
             </div>
-            <div class="form-field radio" dropdown>
+            <div class="form-field radio">
                 <input
-                    dropdown-toggle
                     auto-close="disabled"
                     ng-checked="post.published_to.length"
-                    type="radio">
+                    type="radio" ng-click="toggleRolesView()">
                 <label for="{{post.id}}_everyone" translate="post.specific_roles">Specific roles...</label>
-                <div class="form-fieldgroup" dropdown-menu>
+                <div class="form-fieldgroup" dropdown-menu ng-show="showRoles">
                     <div class="form-field checkbox" ng-repeat="role in roles">
                         <input
                             id="{{role.id}}"

From 7ea04a2efde503c5dd7e8e976f42b59c04310157 Mon Sep 17 00:00:00 2001
From: Jason Mule <jason.mule@gmail.com>
Date: Mon, 4 Jul 2016 20:45:05 +0300
Subject: [PATCH 04/12] Fix radio button selection

---
 .../publish-selector/publish-selector.html      | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/server/www/templates/common/publish-selector/publish-selector.html b/server/www/templates/common/publish-selector/publish-selector.html
index da5eec198a..0e997805e3 100644
--- a/server/www/templates/common/publish-selector/publish-selector.html
+++ b/server/www/templates/common/publish-selector/publish-selector.html
@@ -16,7 +16,7 @@
         <div class="form-fieldgroup" dropdown>
             <div class="form-field radio">
                 <input
-                    name="{{post.id}}_draft"
+                    name="{{post.id}}"
                     id="{{post.id}}_draft"
                     value="draft"
                     type="radio"
@@ -27,7 +27,7 @@
 
             <div class="form-field radio">
                 <input
-                    name="{{post.id}}_everyone"
+                    name="{{post.id}}"
                     id="{{post.id}}_everyone"
                     value=""
                     type="radio"
@@ -36,11 +36,14 @@
                 <label for="{{post.id}}_everyone" translate="post.everyone">Everyone</label>
             </div>
             <div class="form-field radio">
-                <input
-                    auto-close="disabled"
-                    ng-checked="post.published_to.length"
-                    type="radio" ng-click="toggleRolesView()">
-                <label for="{{post.id}}_everyone" translate="post.specific_roles">Specific roles...</label>
+              <input
+                  name="{{post.id}}"
+                  id="{{post.id}}_roles"
+                  auto-close="disabled"
+                  ng-checked="post.published_to.length"
+                  value="roles"
+                  type="radio" ng-click="toggleRolesView()">
+                <label for="{{post.id}}_roles" translate="post.specific_roles">Specific roles...</label>
                 <div class="form-fieldgroup" dropdown-menu ng-show="showRoles">
                     <div class="form-field checkbox" ng-repeat="role in roles">
                         <input

From 3cf4b5c69eb0d70b4f3e6e902a1b2fdd13eaf7c1 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Tue, 5 Jul 2016 09:49:00 +1200
Subject: [PATCH 05/12] Show data sources on a single listing "sheet"

Fix ushahidi/platform#1166
---
 server/www/templates/settings/datasources/datasources.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/www/templates/settings/datasources/datasources.html b/server/www/templates/settings/datasources/datasources.html
index 7a868824ec..ae8f3321de 100644
--- a/server/www/templates/settings/datasources/datasources.html
+++ b/server/www/templates/settings/datasources/datasources.html
@@ -25,10 +25,10 @@ <h1 class="mode-context-title" translate>app.data_sources</h1>
                 <p><em translate>settings.data_sources.hint_turn_on_off</em></p>
             </div>
 
-            <div class="listing card" ng-repeat="provider in providers.results | orderBy:'name'">
+            <div class="listing card">
 
                 <!-- TODO: fix active class toggle -->
-                <div class="listing-item active" is-open="panelVisible[provider.id]"  dropdown auto-close="disabled" ng-if="available_providers[provider.id]">
+                <div class="listing-item active" ng-repeat="provider in providers.results | orderBy:'name'" is-open="panelVisible[provider.id]"  dropdown auto-close="disabled" ng-if="available_providers[provider.id]">
 
                     <div class="listing-item-secondary">
                         <button type="button" class="button-beta button-flat listing-item-toggle" dropdown-toggle>

From 8e873c988647e681e1dce42bfd90e4411cbfb1d0 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Tue, 5 Jul 2016 09:57:22 +1200
Subject: [PATCH 06/12] Don't show register button if site is private

Fixes ushahidi/platform#1094
---
 app/common/controllers/navigation.js     | 12 ------------
 app/frame/directives/mode-bar.js         | 10 ++++++++--
 server/www/templates/frame/mode-bar.html |  2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/common/controllers/navigation.js b/app/common/controllers/navigation.js
index ff1485262c..c6a42cad50 100644
--- a/app/common/controllers/navigation.js
+++ b/app/common/controllers/navigation.js
@@ -33,16 +33,4 @@ function NavigationController(Authentication, ConfigEndpoint, BootstrapConfig, $
     // function canCreatePost() {
     //     return $rootScope.loggedin || !vm.site.private;
     // };
-
-    // Move to mode bar (or associated service)
-    // function canRegister() {
-    //     return !vm.site.private;
-    // };
-
-    // Move to mode bar (or associated service)
-    // function logoutClick(e) {
-    //     e.preventDefault();
-    //     e.stopPropagation();
-    //     Authentication.logout();
-    // };
 }
diff --git a/app/frame/directives/mode-bar.js b/app/frame/directives/mode-bar.js
index 691d133f8d..100ac759cc 100644
--- a/app/frame/directives/mode-bar.js
+++ b/app/frame/directives/mode-bar.js
@@ -4,13 +4,14 @@ module.exports = [
     'Registration',
     'ModalService',
     '$rootScope',
-    'ModalService',
+    'ConfigEndpoint',
 function (
     Features,
     Authentication,
     Registration,
     ModalService,
-    $rootScope
+    $rootScope,
+    ConfigEndpoint
 ) {
     return {
         restrict: 'E',
@@ -24,6 +25,7 @@ function (
             $scope.activeMode = 'map';
             $scope.moreActive = false;
             $scope.isActivityAvailable = false;
+            $scope.canRegister = false;
 
             $scope.hasManageSettingsPermission = $rootScope.hasManageSettingsPermission;
             $scope.showMore = showMore;
@@ -47,6 +49,10 @@ function (
                 Features.loadFeatures().then(function () {
                     $scope.isActivityAvailable = Features.isViewEnabled('activity');
                 });
+
+                ConfigEndpoint.get({id: 'site'}, function (site) {
+                    $scope.canRegister = !site.private;
+                });
             }
 
             // Show account settings
diff --git a/server/www/templates/frame/mode-bar.html b/server/www/templates/frame/mode-bar.html
index cd90b43114..aef40bc8bc 100644
--- a/server/www/templates/frame/mode-bar.html
+++ b/server/www/templates/frame/mode-bar.html
@@ -77,7 +77,7 @@
                 </a>
             </li>
 
-            <li ng-hide="currentUser" ng-show="canRegister()">
+            <li ng-show="!currentUser && canRegister">
                 <a ng-click="register()" data-modal="signup">
                     <svg class="iconic">
                         <use xlink:href="../../img/iconic-sprite.svg#person"></use>

From 8e06269b379b821fa249b19aef9436591a6ac347 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Tue, 5 Jul 2016 10:21:07 +1200
Subject: [PATCH 07/12] Fix styling on filter fieldsets

- Set the filter directives to replace DOM elements
- Update overflow-toggle to no isolate scope
- Fix overflow on filter-form

Fixes https://github.com/ushahidi/platform/issues/1191
---
 .../filter-system/overflow-toggle.js          | 27 +++++++++----------
 .../filters/filter-category.directive.js      |  1 +
 .../views/filters/filter-form.directive.js    |  1 +
 .../filters/filter-location.directive.js      |  1 +
 .../filters/filter-visible-to.directive.js    |  1 +
 .../posts/views/filters/filter-form.html      |  2 +-
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/common/directives/filter-system/overflow-toggle.js b/app/common/directives/filter-system/overflow-toggle.js
index 2effbcf16f..07576b09af 100644
--- a/app/common/directives/filter-system/overflow-toggle.js
+++ b/app/common/directives/filter-system/overflow-toggle.js
@@ -1,24 +1,23 @@
 module.exports = OverflowToggleDirective;
 
-OverflowToggleDirective.$inject = [];
-function OverflowToggleDirective() {
+OverflowToggleDirective.$inject = ['$parse'];
+function OverflowToggleDirective($parse) {
     return {
         restrict: 'A',
-        scope: {
-            hasOverflow: '&'
-        },
         link: OverflowToggleController
     };
-}
 
-function OverflowToggleController($scope, $element) {
-    var toggle = $element[0].querySelector('.form-field-toggle');
+    function OverflowToggleController($scope, $element, $attrs) {
+        var toggle = $element[0].querySelector('.form-field-toggle');
+        var hasOverflow = angular.bind({}, $parse($attrs.hasOverflow), $scope);
 
-    $scope.$watch($scope.hasOverflow, function (hasOverflow) {
-        $element.toggleClass('has-overflow', hasOverflow);
-    });
+        $scope.$watch(hasOverflow, function (hasOverflow) {
+            $element.toggleClass('has-overflow', hasOverflow);
+        });
 
-    angular.element(toggle).on('click', function () {
-        $scope.hasOverflow() ? $element.toggleClass('show-overflow') : '';
-    });
+        angular.element(toggle).on('click', function () {
+            hasOverflow() ? $element.toggleClass('show-overflow') : '';
+        });
+    }
 }
+
diff --git a/app/post/views/filters/filter-category.directive.js b/app/post/views/filters/filter-category.directive.js
index 0d9dd610ac..0558df2606 100644
--- a/app/post/views/filters/filter-category.directive.js
+++ b/app/post/views/filters/filter-category.directive.js
@@ -4,6 +4,7 @@ CategorySelectDirective.$inject = ['TagEndpoint'];
 function CategorySelectDirective(TagEndpoint) {
     return {
         restrict: 'E',
+        replace: true,
         scope: {},
         require: 'ngModel',
         link: CategorySelectLink,
diff --git a/app/post/views/filters/filter-form.directive.js b/app/post/views/filters/filter-form.directive.js
index cf5c8f77e7..7929788464 100644
--- a/app/post/views/filters/filter-form.directive.js
+++ b/app/post/views/filters/filter-form.directive.js
@@ -4,6 +4,7 @@ FormSelectDirective.$inject = ['FormEndpoint'];
 function FormSelectDirective(FormEndpoint) {
     return {
         restrict: 'E',
+        replace: true,
         scope: {},
         require: 'ngModel',
         link: FormSelectLink,
diff --git a/app/post/views/filters/filter-location.directive.js b/app/post/views/filters/filter-location.directive.js
index be7400d28e..dd8aaad045 100644
--- a/app/post/views/filters/filter-location.directive.js
+++ b/app/post/views/filters/filter-location.directive.js
@@ -4,6 +4,7 @@ LocationFilterDirective.$inject = ['Geocoding', '$q'];
 function LocationFilterDirective(Geocoding, $q) {
     return {
         restrict: 'E',
+        replace: true,
         scope: {
             centerPointModel: '=',
             withinKmModel: '='
diff --git a/app/post/views/filters/filter-visible-to.directive.js b/app/post/views/filters/filter-visible-to.directive.js
index c2ac63d40b..e96bdc97cd 100644
--- a/app/post/views/filters/filter-visible-to.directive.js
+++ b/app/post/views/filters/filter-visible-to.directive.js
@@ -4,6 +4,7 @@ VisibleToSelectDirective.$inject = [];
 function VisibleToSelectDirective() {
     return {
         restrict: 'E',
+        replace: true,
         scope: {
             statusModel: '=',
             publishedToModel: '='
diff --git a/server/www/templates/posts/views/filters/filter-form.html b/server/www/templates/posts/views/filters/filter-form.html
index 7ba6fa91e2..77ed26e2ce 100644
--- a/server/www/templates/posts/views/filters/filter-form.html
+++ b/server/www/templates/posts/views/filters/filter-form.html
@@ -6,7 +6,7 @@
             <input checklist-value="form.id" checklist-model="selectedForms" type="checkbox" name="selectedForms" > {{ ::form.name }}
         </label>
     </div>
-    <div class="form-field checkbox" ng-class="{ overflow : (forms.length > 2) }">
+    <div class="form-field checkbox" ng-class="{ overflow : (forms.length > 1) }">
         <label>
             <input checklist-value="'none'" checklist-model="selectedForms" type="checkbox" name="selectedForms" > <span translate="nav.unknown">Unknown</span>
         </label>

From da8d68fc4b8a622423dade817ca349f22ec4fedd Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Tue, 5 Jul 2016 10:37:53 +1200
Subject: [PATCH 08/12] Fix custom map marker positions on map

---
 app/common/services/maps.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/common/services/maps.js b/app/common/services/maps.js
index de0889fc65..b82ba4013f 100644
--- a/app/common/services/maps.js
+++ b/app/common/services/maps.js
@@ -71,8 +71,8 @@ function (
             className: 'custom-map-marker ' + className,
             html: '<svg class="iconic" style="fill:' + color + ';"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="../../img/iconic-sprite.svg#map-marker"></use></svg><span class="iconic-bg" style="background-color:' + color + ';""></span>',
             iconSize: size,
-            iconAnchor: size,
-            popupAnchor: [-16, -32]
+            iconAnchor: [size[0] / 2, size[1]],
+            popupAnchor: [0, 0 - size[1]]
         });
     }
 

From 54867c7d2fb49bf711362414424ef8ae7dee95ce Mon Sep 17 00:00:00 2001
From: will <will.doran@riseup.net>
Date: Mon, 4 Jul 2016 18:57:55 -0400
Subject: [PATCH 09/12] Fixing edit/add/update keywords depending on presences
 absensce of id for entity

---
 app/common/locales/en.json                                | 1 +
 app/setting/directives/setting-survey-editor.directive.js | 3 ++-
 server/www/templates/settings/surveys/modify/editor.html  | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/common/locales/en.json b/app/common/locales/en.json
index b52b9a35e3..6d6de8ea44 100644
--- a/app/common/locales/en.json
+++ b/app/common/locales/en.json
@@ -33,6 +33,7 @@
         "share": "Share",
         "general" : "General",
         "surveys" : "Surveys",
+        "add_survey" : "Add Survey",
         "edit_survey" : "Edit Survey",
         "data_sources" : "Data Sources",
         "import" : "Import",
diff --git a/app/setting/directives/setting-survey-editor.directive.js b/app/setting/directives/setting-survey-editor.directive.js
index b93bcc80f3..907959ec53 100644
--- a/app/setting/directives/setting-survey-editor.directive.js
+++ b/app/setting/directives/setting-survey-editor.directive.js
@@ -288,7 +288,8 @@ function SurveyEditorController(
             ModalService.close();
         }
         $scope.editAttribute = attribute;
-        ModalService.openTemplate('<survey-attribute-editor></survey-attribute-editor>', 'survey.edit_field', '', $scope, true, true);
+        var title = attribute.id ? 'survey.edit_field' : 'survey.add_field';
+        ModalService.openTemplate('<survey-attribute-editor></survey-attribute-editor>', title, '', $scope, true, true);
     }
 
     function addNewAttribute(attribute) {
diff --git a/server/www/templates/settings/surveys/modify/editor.html b/server/www/templates/settings/surveys/modify/editor.html
index 6618a784ae..cffa102516 100644
--- a/server/www/templates/settings/surveys/modify/editor.html
+++ b/server/www/templates/settings/surveys/modify/editor.html
@@ -7,7 +7,8 @@
                 <li><a href="/settings" translate>app.settings</a></li>
                 <li><a href="/settings/surveys" translate>app.surveys</a></li>
             </ol>
-            <h1 class="mode-context-title" translate>app.edit_survey</h1>
+            <h1 ng-show="survey.id" class="mode-context-title" translate>app.edit_survey</h1>
+            <h1 ng-show="!survey.id" class="mode-context-title" translate>app.add_survey</h1>
         </header>
 
         <span class="mode-context-trigger" dropdown-toggle>
@@ -47,7 +48,7 @@ <h1 class="mode-context-title" translate>app.edit_survey</h1>
                 <div class="form-field form-field-adapt">
                     <label translate>app.description</label>
                     <textarea name="description" data-min-rows='1' rows='1' ng-model="survey.description"></textarea>
-                </div>                
+                </div>
                 <color-picker color-container="survey"></color-picker>
                 <fieldset class="custom-fieldset init" dropdown auto-close="outsideClick">
                     <legend class="dropdown-trigger init" data-toggle="dropdown-menu" dropdown-toggle>

From e6954c7f0c1346175cfff66decc23bfc304f3bbd Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Tue, 5 Jul 2016 11:02:20 +1200
Subject: [PATCH 10/12] Limit map to scroll within bounds

Fixes ushahidi/platform#1112
---
 app/common/services/maps.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/common/services/maps.js b/app/common/services/maps.js
index b82ba4013f..f81ea0f442 100644
--- a/app/common/services/maps.js
+++ b/app/common/services/maps.js
@@ -191,6 +191,7 @@ function (
             // Disable 'Leaflet prefix on attributions'
             this.map().then(function (map) {
                 map.attributionControl.setPrefix(false);
+                map.setMaxBounds([[-90,-360],[90,360]]);
             });
 
             return this;

From f39d476d590105f8073e67f63bb6b801a937fea0 Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Tue, 5 Jul 2016 11:19:28 +1200
Subject: [PATCH 11/12] Close roles when everyone or just you is selected

---
 app/common/directives/publish-selector.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/common/directives/publish-selector.js b/app/common/directives/publish-selector.js
index f3f4c6754a..d2caa97acd 100644
--- a/app/common/directives/publish-selector.js
+++ b/app/common/directives/publish-selector.js
@@ -22,6 +22,7 @@ function (
             RoleEndpoint,
             _
         ) {
+            $scope.showRoles = !!$scope.post.published_to.length;
 
             $scope.canSeeThis = function () {
                 if ($scope.post.published_to && $scope.post.published_to.length) {
@@ -44,13 +45,14 @@ function (
             $scope.toggleRole = function (role) {
                 if (role === 'draft' || role === '') {
                     $scope.post.published_to = [];
+                    $scope.showRoles = false;
                 } else if ($scope.checkIfAllSelected()) {
                     // All check boxes selected, therefore publish to everyone
                     $scope.post.published_to = [];
+                    $scope.showRoles = false;
                 }
 
                 $scope.post.status = role === 'draft' ? role : 'published';
-
             };
 
             $scope.toggleRolesView = function () {

From 1c13d1b9b44b01ec042bb7cf9345e15c2dfdbe6b Mon Sep 17 00:00:00 2001
From: Robbie Mackay <rm@robbiemackay.com>
Date: Tue, 5 Jul 2016 11:19:47 +1200
Subject: [PATCH 12/12] Use display name for  role selector header

---
 app/common/directives/publish-selector.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/common/directives/publish-selector.js b/app/common/directives/publish-selector.js
index d2caa97acd..6690f00fe7 100644
--- a/app/common/directives/publish-selector.js
+++ b/app/common/directives/publish-selector.js
@@ -26,7 +26,9 @@ function (
 
             $scope.canSeeThis = function () {
                 if ($scope.post.published_to && $scope.post.published_to.length) {
-                    return $scope.post.published_to.join(', ');
+                    return _.map($scope.post.published_to, function (role) {
+                        return $scope.roles[role].display_name;
+                    }).join(', ');
                 } else if ($scope.post.status === 'draft') {
                     return $translate.instant('post.just_you');
                 } else {
@@ -35,7 +37,7 @@ function (
             };
 
             RoleEndpoint.query().$promise.then(function (roles) {
-                $scope.roles = roles;
+                $scope.roles = _.indexBy(roles, 'name');
             });
 
             $scope.checkIfAllSelected = function () {