Browse Source

UserProfilePage: Fix team avatar urls #17866 (#17930)

Tobias Skarhed 6 years ago
parent
commit
55b63905ea
1 changed files with 41 additions and 17 deletions
  1. 41 17
      public/app/features/profile/partials/profile.html

+ 41 - 17
public/app/features/profile/partials/profile.html

@@ -4,20 +4,39 @@
   <h3 class="page-sub-heading">User Profile</h3>
 
   <form name="ctrl.userForm" class="gf-form-group">
-
     <div class="gf-form max-width-30">
       <span class="gf-form-label width-8">Name</span>
-      <input class="gf-form-input max-width-22" type="text" required ng-model="ctrl.user.name">
+      <input class="gf-form-input max-width-22" type="text" required ng-model="ctrl.user.name" />
     </div>
     <div class="gf-form max-width-30">
       <span class="gf-form-label width-8">Email</span>
-      <input class="gf-form-input max-width-22" type="email" ng-readonly="ctrl.readonlyLoginFields" required ng-model="ctrl.user.email">
-      <i ng-if="ctrl.readonlyLoginFields" class="fa fa-lock gf-form-icon--right-absolute" bs-tooltip="'Login Details Locked - managed in another system.'"></i>
+      <input
+        class="gf-form-input max-width-22"
+        type="email"
+        ng-readonly="ctrl.readonlyLoginFields"
+        required
+        ng-model="ctrl.user.email"
+      />
+      <i
+        ng-if="ctrl.readonlyLoginFields"
+        class="fa fa-lock gf-form-icon--right-absolute"
+        bs-tooltip="'Login Details Locked - managed in another system.'"
+      ></i>
     </div>
     <div class="gf-form max-width-30">
       <span class="gf-form-label width-8">Username</span>
-      <input class="gf-form-input max-width-22" type="text" ng-readonly="ctrl.readonlyLoginFields" required ng-model="ctrl.user.login">
-      <i ng-if="ctrl.readonlyLoginFields" class="fa fa-lock gf-form-icon--right-absolute" bs-tooltip="'Login Details Locked - managed in another system.'"></i>
+      <input
+        class="gf-form-input max-width-22"
+        type="text"
+        ng-readonly="ctrl.readonlyLoginFields"
+        required
+        ng-model="ctrl.user.login"
+      />
+      <i
+        ng-if="ctrl.readonlyLoginFields"
+        class="fa fa-lock gf-form-icon--right-absolute"
+        bs-tooltip="'Login Details Locked - managed in another system.'"
+      ></i>
     </div>
     <div class="gf-form-button-row">
       <button type="submit" class="btn btn-primary" ng-click="ctrl.update()">Save</button>
@@ -39,10 +58,10 @@
       </thead>
       <tbody>
         <tr ng-repeat="team in ctrl.teams">
-          <td class="width-4 text-center"><img class="filter-table__avatar" src={{team.avatarUrl}}></td>
-          <td>{{team.name}}</td>
-          <td>{{team.email}}</td>
-          <td>{{team.memberCount}}</td>
+          <td class="width-4 text-center"><img class="filter-table__avatar" ng-src="{{ team.avatarUrl }}" /></td>
+          <td>{{ team.name }}</td>
+          <td>{{ team.email }}</td>
+          <td>{{ team.memberCount }}</td>
         </tr>
       </tbody>
     </table>
@@ -60,13 +79,17 @@
       </thead>
       <tbody>
         <tr ng-repeat="org in ctrl.orgs">
-          <td>{{org.name}}</td>
-          <td>{{org.role}}</td>
+          <td>{{ org.name }}</td>
+          <td>{{ org.role }}</td>
           <td class="text-right">
             <span class="btn btn-primary btn-small" ng-show="org.orgId === contextSrv.user.orgId">
               Current
             </span>
-            <a ng-click="ctrl.setUsingOrg(org)" class="btn btn-inverse btn-small" ng-show="org.orgId !== contextSrv.user.orgId">
+            <a
+              ng-click="ctrl.setUsingOrg(org)"
+              class="btn btn-inverse btn-small"
+              ng-show="org.orgId !== contextSrv.user.orgId"
+            >
               Select
             </a>
           </td>
@@ -90,10 +113,10 @@
       <tbody>
         <tr ng-repeat="session in ctrl.sessions">
           <td ng-if="session.isActive">Now</td>
-          <td ng-if="!session.isActive">{{session.seenAt}}</td>
-          <td>{{session.createdAt}}</td>
-          <td>{{session.clientIp}}</td>
-          <td>{{session.browser}} on {{session.os}} {{session.osVersion}}</td>
+          <td ng-if="!session.isActive">{{ session.seenAt }}</td>
+          <td>{{ session.createdAt }}</td>
+          <td>{{ session.clientIp }}</td>
+          <td>{{ session.browser }} on {{ session.os }} {{ session.osVersion }}</td>
           <td>
             <button class="btn btn-danger btn-small" ng-click="ctrl.revokeUserSession(session.id)">
               <i class="fa fa-power-off"></i>
@@ -103,3 +126,4 @@
       </tbody>
     </table>
   </div>
+</div>