Skip to content

Commit

Permalink
Merge 6be9861 into 28be572
Browse files Browse the repository at this point in the history
  • Loading branch information
andimarc committed Oct 4, 2018
2 parents 28be572 + 6be9861 commit f2e8000
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -95,17 +95,17 @@ <h3>{{ 'feature_applicationSettingsName' | translate }}</h3>
<tr *ngIf="!groupArray || (!!groupArray && appSettingsTable.items.length - originalItemsDeleted === 0)" table-row>

<!-- ARM call did not return successfully, and user has permissions -->
<td *ngIf="!groupArray && hasWritePermissions" class="message-row" colspan="3" table-cell [editable]="false">
<td *ngIf="!groupArray && hasWritePermissions" class="message-row" colspan="4" table-cell [editable]="false">
{{ (loadingFailureMessage || loadingMessage) }}
</td>

<!-- ARM call did not return successfully, and user doesn't have permissions -->
<td *ngIf="!groupArray && !hasWritePermissions" class="message-row" colspan="3" table-cell [editable]="false">
<td *ngIf="!groupArray && !hasWritePermissions" class="message-row" colspan="4" table-cell [editable]="false">
{{ (showPermissionsMessage) ? permissionsMessage : '' }}
</td>

<!-- ARM call returned successfully, but there are no entries to display -->
<td *ngIf="!!groupArray && appSettingsTable.items.length - originalItemsDeleted === 0" class="message-row" colspan="3" table-cell [editable]="false">
<td *ngIf="!!groupArray && appSettingsTable.items.length - originalItemsDeleted === 0" class="message-row" colspan="4" table-cell [editable]="false">
{{ ('emptyAppSettings' | translate) }}
</td>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,17 @@ <h3>{{ 'connectionStrings' | translate }}</h3>
<tr *ngIf="!groupArray || (!!groupArray && connectionStringsTable.items.length - originalItemsDeleted === 0)" table-row>

<!-- ARM call did not return successfully, and user has permissions -->
<td *ngIf="!groupArray && hasWritePermissions" class="message-row" colspan="4" table-cell [editable]="false">
<td *ngIf="!groupArray && hasWritePermissions" class="message-row" colspan="5" table-cell [editable]="false">
{{ (loadingFailureMessage || loadingMessage) }}
</td>

<!-- ARM call did not return successfully, and user doesn't have permissions -->
<td *ngIf="!groupArray && !hasWritePermissions" class="message-row" colspan="4" table-cell [editable]="false">
<td *ngIf="!groupArray && !hasWritePermissions" class="message-row" colspan="5" table-cell [editable]="false">
{{ showPermissionsMessage ? permissionsMessage : '' }}
</td>

<!-- ARM call returned successfully, but there are no entries to display -->
<td *ngIf="!!groupArray && connectionStringsTable.items.length - originalItemsDeleted === 0" class="message-row" colspan="4" table-cell [editable]="false">
<td *ngIf="!!groupArray && connectionStringsTable.items.length - originalItemsDeleted === 0" class="message-row" colspan="5" table-cell [editable]="false">
{{ ('emptyConnectionStrings' | translate) }}
</td>

Expand Down

0 comments on commit f2e8000

Please sign in to comment.