Browse Source

Use normal version.

pull/624/head
Sebastian 5 years ago
parent
commit
579a9a4c55
  1. 2
      frontend/app/shared/components/assets/asset-dialog.component.html
  2. 2
      frontend/app/shared/components/assets/asset-history.component.html
  3. 10
      frontend/app/shared/components/assets/asset-history.component.ts
  4. 4
      frontend/app/shared/components/assets/asset.component.html
  5. 2
      frontend/app/shared/components/assets/pipes.ts

2
frontend/app/shared/components/assets/asset-dialog.component.html

@ -92,7 +92,7 @@
<div class="row no-gutters"> <div class="row no-gutters">
<div class="col"> <div class="col">
<input readonly class="form-control" name="url" id="url" value="{{asset | sqxAssetUrl:asset.fileVersion:false}}" #inputUrl> <input readonly class="form-control" name="url" id="url" value="{{asset | sqxAssetUrl:asset.version:false}}" #inputUrl>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<button type="button" class="btn btn-text" [sqxCopy]="inputUrl"> <button type="button" class="btn btn-text" [sqxCopy]="inputUrl">

2
frontend/app/shared/components/assets/asset-history.component.html

@ -12,7 +12,7 @@
<div class="event-created">{{assetEvent.event.created | sqxFromNow}}</div> <div class="event-created">{{assetEvent.event.created | sqxFromNow}}</div>
<ng-container *ngIf="assetEvent.canDownload"> <ng-container *ngIf="assetEvent.canDownload">
<a class="event-load force" [href]="asset | sqxAssetUrl:assetEvent.fileVersion" sqxExternalLink="noicon">{{ 'assets.downloadVersion' | sqxTranslate }}</a> <a class="event-load force" [href]="asset | sqxAssetUrl:assetEvent.version" sqxExternalLink="noicon">{{ 'assets.downloadVersion' | sqxTranslate }}</a>
</ng-container> </ng-container>
</div> </div>
</div> </div>

10
frontend/app/shared/components/assets/asset-history.component.ts

@ -10,7 +10,7 @@ import { AppsState, AssetDto, HistoryEventDto, HistoryService } from '@app/share
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
interface AssetEvent { event: HistoryEventDto; fileVersion: number; canDownload: boolean; } interface AssetEvent { event: HistoryEventDto; version: number; canDownload: boolean; }
@Component({ @Component({
selector: 'sqx-asset-history', selector: 'sqx-asset-history',
@ -35,18 +35,16 @@ export class AssetHistoryComponent implements OnChanges {
this.assetEvents = this.assetEvents =
this.historyService.getHistory(this.appsState.appName, channel).pipe( this.historyService.getHistory(this.appsState.appName, channel).pipe(
map(events => { map(events => {
let fileVersion = -1; let version = -1;
return events.map(event => { return events.map(event => {
const canDownload = const canDownload =
event.eventType === 'AssetUpdatedEventV2' || event.eventType === 'AssetUpdatedEventV2' ||
event.eventType === 'AssetCreatedEventV2'; event.eventType === 'AssetCreatedEventV2';
if (canDownload) { version++;
fileVersion++;
}
return { event, fileVersion, canDownload }; return { event, version, canDownload };
}); });
})); }));
} }

4
frontend/app/shared/components/assets/asset.component.html

@ -30,7 +30,7 @@
<i class="icon-pencil"></i> <i class="icon-pencil"></i>
</a> </a>
<a class="file-download ml-2" [href]="asset | sqxAssetUrl:asset.fileVersion:false" sqxStopClick sqxExternalLink="noicon"> <a class="file-download ml-2" [href]="asset | sqxAssetUrl:asset.version:false" sqxStopClick sqxExternalLink="noicon">
<i class="icon-download"></i> <i class="icon-download"></i>
</a> </a>
@ -139,7 +139,7 @@
<img class="user-picture" title="{{asset.lastModifiedBy | sqxUserNameRef}}" [src]="asset.lastModifiedBy | sqxUserPictureRef"> <img class="user-picture" title="{{asset.lastModifiedBy | sqxUserNameRef}}" [src]="asset.lastModifiedBy | sqxUserPictureRef">
</td> </td>
<td class="col-actions text-right"> <td class="col-actions text-right">
<a class="btn btn-text-secondary" [href]="asset | sqxAssetUrl:asset.fileVersion:false" sqxStopClick sqxExternalLink="noicon"> <a class="btn btn-text-secondary" [href]="asset | sqxAssetUrl:asset.version:false" sqxStopClick sqxExternalLink="noicon">
<i class="icon-download"></i> <i class="icon-download"></i>
</a> </a>

2
frontend/app/shared/components/assets/pipes.ts

@ -47,7 +47,7 @@ export class AssetPreviewUrlPipe implements PipeTransform {
public transform(asset: AssetDto): string { public transform(asset: AssetDto): string {
let url = asset.fullUrl(this.apiUrl, this.authService); let url = asset.fullUrl(this.apiUrl, this.authService);
url = StringHelper.appendToUrl(url, 'version', asset.fileVersion); url = StringHelper.appendToUrl(url, 'version', asset.version);
return url; return url;
} }

Loading…
Cancel
Save