Merge pull request #4698 from ninjadq/fix_configure_save_err

Fix configure save err
This commit is contained in:
Steven Zou 2018-04-18 11:15:39 +08:00 committed by GitHub
commit 0f4c54ec60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 6 deletions

View File

@ -1,6 +1,6 @@
{
"name": "harbor-ui",
"version": "0.6.72",
"version": "0.7.0",
"description": "Harbor shared UI components based on Clarity and Angular4",
"scripts": {
"start": "ng serve --host 0.0.0.0 --port 4500 --proxy-config proxy.config.json",

View File

@ -1,6 +1,6 @@
{
"name": "harbor-ui",
"version": "0.6.72",
"version": "0.7.0",
"description": "Harbor shared UI components based on Clarity and Angular4",
"author": "VMware",
"module": "index.js",

View File

@ -50,11 +50,11 @@ export const REPOSITORY_GRIDVIEW_TEMPLATE = `
<ng-template let-item="item">
<a class="card clickable" (click)="watchRepoClickEvt(item)">
<div class="card-header">
<div class="card-media-block">
<div [ngClass]="{'card-media-block': withAdmiral, 'card-media-block wrap': !withAdmiral }">
<img *ngIf="withAdmiral" [src]="getImgLink(item)"/>
<div class="card-media-description">
<span class="card-media-title">
{{item.name}}
{{ (item.name?.length>29) ? (item.name | slice:0:29) + '...' : (item.name)}}
</span>
<p class="card-media-text">{{registryUrl}}</p>
</div>

View File

@ -318,6 +318,8 @@ export class RepositoryGridviewComponent implements OnChanges, OnInit {
this.loading = false;
this.errorHandler.error(error);
});
let hnd = setInterval(() => this.ref.markForCheck(), 500);
setTimeout(() => clearInterval(hnd), 5000);
}
clrLoad(state: State): void {

View File

@ -30,7 +30,7 @@
"clarity-icons": "0.10.24",
"clarity-ui": "0.10.24",
"core-js": "^2.4.1",
"harbor-ui": "0.6.75",
"harbor-ui": "0.7.0",
"intl": "^1.2.5",
"mutationobserver-shim": "^0.3.2",
"ngx-cookie": "^1.0.0",

View File

@ -266,7 +266,7 @@ export class ConfigurationComponent implements OnInit, OnDestroy {
this.msgHandler.handleReadOnly();
}
if (changes['read_only'].toString() === "false") {
if (changes['read_only'] && changes['read_only'].toString() === "false") {
this.msgHandler.clear();
}