Commit c0180312 authored by Steven Zou's avatar Steven Zou Committed by GitHub
Browse files

Merge pull request #1438 from vmware/fix/namespace_duplicated

fix component namespace duplicated bug
parents 16df9fec 8173aaea
......@@ -24,7 +24,7 @@
<a href="javascript:void(0)" clrDropdownItem>中文繁體</a>
</div>
</clr-dropdown>
<clr-dropdown [clrMenuPosition]="'bottom-left'" class="dropdown" *ngIf="isSessionValid">
<clr-dropdown [clrMenuPosition]="'bottom-right'" class="dropdown" *ngIf="isSessionValid">
<button class="nav-text" clrDropdownToggle>
<clr-icon shape="user" class="is-inverse" size="24" style="left: -2px;"></clr-icon>
<span>{{accountName}}</span>
......
import {Component} from "@angular/core";
@Component({
selector: "clr-dg-action-overflow",
templateUrl: "datagrid-action-overflow.html"
selector: "harbor-action-overflow",
templateUrl: "harbor-action-overflow.html"
})
export class DatagridActionOverflow {
export class HarborActionOverflow {
}
\ No newline at end of file
......@@ -7,7 +7,7 @@ import { MessageComponent } from '../global-message/message.component';
import { MessageService } from '../global-message/message.service';
import { MaxLengthExtValidatorDirective } from './max-length-ext.directive';
import { FilterComponent } from './filter/filter.component';
import { DatagridActionOverflow } from './clg-dg-action-overflow/datagrid-action-overflow';
import { HarborActionOverflow } from './harbor-action-overflow/harbor-action-overflow';
@NgModule({
imports: [
......@@ -17,14 +17,14 @@ import { DatagridActionOverflow } from './clg-dg-action-overflow/datagrid-action
MessageComponent,
MaxLengthExtValidatorDirective,
FilterComponent,
DatagridActionOverflow
HarborActionOverflow
],
exports: [
CoreModule,
MessageComponent,
MaxLengthExtValidatorDirective,
FilterComponent,
DatagridActionOverflow
HarborActionOverflow
],
providers: [SessionService, MessageService]
})
......
......@@ -23,11 +23,11 @@
<clr-dg-cell>{{user.email}}</clr-dg-cell>
<clr-dg-cell>
{{user.creation_time}}
<clr-dg-action-overflow>
<harbor-action-overflow>
<a href="javascript:void(0)" class="dropdown-item" (click)="changeAdminRole(user)">{{user.has_admin_role?"Disable administrator":"Enable administrator"}}</a>
<div class="dropdown-divider"></div>
<a href="javascript:void(0)" class="dropdown-item" (click)="deleteUser(user.user_id)">Delete</a>
</clr-dg-action-overflow>
</harbor-action-overflow>
</clr-dg-cell>
</clr-dg-row>
<clr-dg-footer>{{users.length}} users</clr-dg-footer>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment