Skip to content

Commit ac716eb

Browse files
authored
Merge branch 'vnext' into enable-ssr
2 parents b295b18 + 77b80f4 commit ac716eb

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

azure-devops/templates/cd-template.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@ steps:
174174
echo "##vso[task.logissue type=warning]No changes to commit."
175175
exit 0
176176
else
177-
echo "##vso[task.setvariable variable=changesDetected;isOutput=true]true"
177+
echo "##vso[task.setvariable variable=changesDetected;]true"
178178
fi
179179
workingDirectory: ${{ parameters.workingDir }}/igniteui-live-editing-samples/${{ parameters.submoduleDir }}
180180

181181
- task: CmdLine@2
182182
displayName: Commit changes
183-
condition: and(eq(variables['changesDetected'], 'true'), eq(${{ parameters.repositoryfy }}, 'true'))
183+
condition: and(eq(variables['changesDetected'], true), eq(${{ parameters.repositoryfy }}, 'true'))
184184
inputs:
185185
script: |
186186
git config user.name "tfsbuild"
@@ -191,7 +191,7 @@ steps:
191191

192192
- task: CmdLine@2
193193
displayName: Push changes
194-
condition: and(eq(variables['changesDetected'], 'true'), eq(${{ parameters.repositoryfy }}, 'true'))
194+
condition: and(eq(variables['changesDetected'], true), eq(${{ parameters.repositoryfy }}, 'true'))
195195
inputs:
196196
script: git push
197197
workingDirectory: ${{ parameters.workingDir }}/igniteui-live-editing-samples/${{ parameters.submoduleDir }}

igniteui-live-editing-samples

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<div class="combo-wrapper">
2-
<igx-combo [data]="items" valueKey="name" displayKey="name" [ngModel]="[items[2]]" width="410px" [overlaySettings]="{ outlet: element, modal: true }">
2+
<igx-combo [data]="items" valueKey="name" displayKey="name" [ngModel]="[items[2].name]" width="410px" [overlaySettings]="{ outlet: element, modal: true }">
33
</igx-combo>
44
</div>

src/app/services/transaction/transaction-base/transaction-base.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { NgClass } from '@angular/common';
55
import { TransactionBasePipe } from '../pipes/transaction-base.pipe';
66

77
@Component({
8+
providers: [IgxTransactionService],
89
selector: 'app-transaction-base',
910
styleUrls: ['./transaction-base.component.scss'],
1011
templateUrl: 'transaction-base.component.html',

0 commit comments

Comments
 (0)