- Add support for orgs in the entity search and the notification system

- Fix the titles/names of the different notification types
- Fix the styling of the options buttons on the notifications
This commit is contained in:
Joseph Schorr 2014-07-22 13:39:41 -04:00
parent 1ffbc77106
commit 54ee94754e
6 changed files with 55 additions and 13 deletions

View file

@ -66,7 +66,7 @@
placeholder="''"
current-entity="currentConfig[field.name]"
ng-model="currentConfig[field.name]"
allowed-entities="['user', 'team']"
allowed-entities="['user', 'team', 'org']"
ng-switch-when="entity">
</div>
</td>
@ -89,7 +89,7 @@
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-primary"
ng-disabled="createForm.$invalid || !currentMethod || !currentEvent || creating">
ng-disabled="createForm.$invalid || !currentMethod.id || !currentEvent.id || creating">
Create Notification
</button>
<button type="button" class="btn btn-default" data-dismiss="modal" ng-disabled="creating">Cancel</button>

View file

@ -6,7 +6,14 @@
<span ng-if="getIsAdmin(namespace)"><a href="/organization/{{ namespace }}/teams/{{ entity.name }}">{{entity.name}}</a></span>
</span>
</span>
<span ng-if="entity.kind != 'team'">
<span ng-if="entity.kind == 'org'">
<img src="//www.gravatar.com/avatar/{{ entity.gravatar }}?s=16&amp;d=identicon">
<span class="entity-name">
<span ng-if="!getIsAdmin(entity.name)">{{entity.name}}</span>
<span ng-if="getIsAdmin(entity.name)"><a href="/organization/{{ entity.name }}">{{entity.name}}</a></span>
</span>
</span>
<span ng-if="entity.kind != 'team' && entity.kind != 'org'">
<i class="fa fa-user" ng-show="!entity.is_robot" data-title="User" bs-tooltip="tooltip.title" data-container="body"></i>
<i class="fa fa-wrench" ng-show="entity.is_robot" data-title="Robot Account" bs-tooltip="tooltip.title" data-container="body"></i>
<span class="entity-name" ng-if="entity.is_robot">