Browse Source

Bugfixes

pull/1/head
Sebastian 9 years ago
parent
commit
9e56db680d
  1. 2
      src/Squidex.Store.MongoDb/Apps/MongoAppClientEntity.cs
  2. 2
      src/Squidex.Store.MongoDb/History/MessagesEN.cs
  3. 2
      src/Squidex/app/features/settings/pages/clients/client.component.html
  4. 6
      src/Squidex/app/features/settings/pages/clients/client.component.ts
  5. 2
      src/Squidex/app/shared/components/history.component.ts

2
src/Squidex.Store.MongoDb/Apps/MongoAppClientEntity.cs

@ -32,7 +32,7 @@ namespace Squidex.Store.MongoDb.Apps
string IAppClientEntity.Name string IAppClientEntity.Name
{ {
get { return Name ?? Id; } get { return !string.IsNullOrWhiteSpace(Name) ? Name : Id; }
} }
} }
} }

2
src/Squidex.Store.MongoDb/History/MessagesEN.cs

@ -35,7 +35,7 @@ namespace Squidex.Store.MongoDb.History
}, },
{ {
TypeNameRegistry.GetName<AppClientRenamed>(), TypeNameRegistry.GetName<AppClientRenamed>(),
"renamed client {[Id]} to {[Name]}" "named client {[Id]} as {[Name]}"
}, },
{ {
TypeNameRegistry.GetName<AppLanguageAdded>(), TypeNameRegistry.GetName<AppLanguageAdded>(),

2
src/Squidex/app/features/settings/pages/clients/client.component.html

@ -18,7 +18,7 @@
<input type="text" class="form-control" formControlName="name" maxlength="20" sqxFocusOnInit (keydown)="onKeyDown($event.keyCode)" /> <input type="text" class="form-control" formControlName="name" maxlength="20" sqxFocusOnInit (keydown)="onKeyDown($event.keyCode)" />
</div> </div>
<button type="submit" class="btn btn-primary">Save</button> <button type="submit" class="btn btn-primary" [disabled]="!renameForm.valid">Save</button>
<a class="btn btn-default btn-cancel" (click)="cancelRename()"> <a class="btn btn-default btn-cancel" (click)="cancelRename()">
<i class="icon-close"></i> <i class="icon-close"></i>

6
src/Squidex/app/features/settings/pages/clients/client.component.ts

@ -6,7 +6,7 @@
*/ */
import { Component, EventEmitter, Input, Output } from '@angular/core'; import { Component, EventEmitter, Input, Output } from '@angular/core';
import { FormBuilder, FormGroup } from '@angular/forms'; import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { import {
AccessTokenDto, AccessTokenDto,
@ -61,7 +61,9 @@ export class ClientComponent {
public renameForm: FormGroup = public renameForm: FormGroup =
this.formBuilder.group({ this.formBuilder.group({
name: [''] name: ['',
Validators.required
]
}); });
constructor( constructor(

2
src/Squidex/app/shared/components/history.component.ts

@ -82,7 +82,7 @@ export class HistoryComponent extends AppComponentBase implements OnDestroy, OnI
} }
}); });
message = message.replace(/{([^\s:]*)}/, (match: string, marker: string) => { message = message.replace(/{([^}]*)}/g, (match: string, marker: string) => {
return `<span class="marker-ref">${marker}</span>`; return `<span class="marker-ref">${marker}</span>`;
}); });

Loading…
Cancel
Save