don't allow the normal People admin actions to be enabled on oneself.

aq · Jun 14, 2016 · 6a92970 · 6a92970
1 parent 3c80025
commit 6a92970
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/frontend/src/metabase/admin/people/components/AdminPeople.jsx b/frontend/src/metabase/admin/people/components/AdminPeople.jsx
@@ -44,7 +44,7 @@ export default class AdminPeople extends Component {
 
     static propTypes = {
         dispatch: PropTypes.func.isRequired,
-        users: PropTypes.array
+        users: PropTypes.object
     };
 
     async componentDidMount() {
@@ -382,7 +382,9 @@ export default class AdminPeople extends Component {
                                     </td>
                                     <td>{ user.last_login ? user.last_login.fromNow() : "Never" }</td>
                                     <td className="text-right">
-                                        <UserActionsSelect user={user} dispatch={this.props.dispatch} />
+                                        { this.props.user.id !== user.id &&
+                                            <UserActionsSelect user={user} dispatch={this.props.dispatch} />
+                                        }
                                     </td>
                                 </tr>
                                 )}

diff --git a/frontend/src/metabase/admin/people/people.module.js b/frontend/src/metabase/admin/people/people.module.js
@@ -7,6 +7,11 @@ var AdminPeople = angular.module('metabase.admin.people', [
 AdminPeople.config(['$routeProvider', function ($routeProvider) {
     $routeProvider.when('/admin/people/', {
         template: '<div mb-redux-component class="flex flex-column flex-full" />',
-        controller: 'PeopleList'
+        controller: 'PeopleList',
+        resolve: {
+            appState: ["AppState", function(AppState) {
+                return AppState.init();
+            }]
+        }
     });
 }]);