Skip to content

Commit a036f67

Browse files
authored
Improve App::getTag() (#1839)
1 parent 1aab74b commit a036f67

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+173
-206
lines changed

.github/workflows/test-unit.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ jobs:
167167
php -d opcache.enable_cli=1 vendor/bin/phpunit --exclude-group none $(if [ -n "$LOG_COVERAGE" ]; then echo --coverage-text; else echo --no-coverage; fi) -v
168168
if [ -n "$LOG_COVERAGE" ]; then mv coverage/phpunit.cov coverage/phpunit-mysql.cov; fi
169169
170-
- name: "Run tests: MariaDB"
171-
if: success() || failure()
170+
- name: "Run tests: MariaDB (only for cron)"
171+
if: (success() || failure()) && github.event_name == 'schedule'
172172
env:
173173
DB_DSN: "mysql:host=mariadb;dbname=atk4_test"
174174
DB_USER: atk4_test_user
@@ -179,8 +179,8 @@ jobs:
179179
php -d opcache.enable_cli=1 vendor/bin/phpunit --exclude-group none $(if [ -n "$LOG_COVERAGE" ]; then echo --coverage-text; else echo --no-coverage; fi) -v
180180
if [ -n "$LOG_COVERAGE" ]; then mv coverage/phpunit.cov coverage/phpunit-mariadb.cov; fi
181181
182-
- name: "Run tests: PostgreSQL"
183-
if: success() || failure()
182+
- name: "Run tests: PostgreSQL (only for cron)"
183+
if: (success() || failure()) && github.event_name == 'schedule'
184184
env:
185185
DB_DSN: "pgsql:host=postgres;dbname=atk4_test"
186186
DB_USER: atk4_test_user
@@ -191,8 +191,8 @@ jobs:
191191
php -d opcache.enable_cli=1 vendor/bin/phpunit --exclude-group none $(if [ -n "$LOG_COVERAGE" ]; then echo --coverage-text; else echo --no-coverage; fi) -v
192192
if [ -n "$LOG_COVERAGE" ]; then mv coverage/phpunit.cov coverage/phpunit-postgres.cov; fi
193193
194-
- name: "Run tests: MSSQL"
195-
if: success() || failure()
194+
- name: "Run tests: MSSQL (only for cron)"
195+
if: (success() || failure()) && github.event_name == 'schedule'
196196
env:
197197
DB_DSN: "sqlsrv:host=mssql;dbname=master;driverOptions[TrustServerCertificate]=1"
198198
DB_USER: sa
@@ -203,8 +203,8 @@ jobs:
203203
php -d opcache.enable_cli=1 vendor/bin/phpunit --exclude-group none $(if [ -n "$LOG_COVERAGE" ]; then echo --coverage-text; else echo --no-coverage; fi) -v
204204
if [ -n "$LOG_COVERAGE" ]; then mv coverage/phpunit.cov coverage/phpunit-mssql.cov; fi
205205
206-
- name: "Run tests: Oracle"
207-
if: success() || failure()
206+
- name: "Run tests: Oracle (only for cron)"
207+
if: (success() || failure()) && github.event_name == 'schedule'
208208
env:
209209
DB_DSN: "oci:dbname=oracle/xe"
210210
DB_USER: system
@@ -379,8 +379,8 @@ jobs:
379379
php demos/_demo-data/create-db.php
380380
vendor/bin/behat -vv --config behat.yml.dist
381381
382-
- name: "Run tests: MariaDB (only for coverage or cron)"
383-
if: (success() || failure()) && (env.LOG_COVERAGE || github.event_name == 'schedule')
382+
- name: "Run tests: MariaDB (only for cron)"
383+
if: (success() || failure()) && github.event_name == 'schedule'
384384
env:
385385
DB_DSN: "mysql:host=mariadb;dbname=atk4_test"
386386
DB_USER: atk4_test_user
@@ -390,8 +390,8 @@ jobs:
390390
php demos/_demo-data/create-db.php
391391
vendor/bin/behat -vv --config behat.yml.dist
392392
393-
- name: "Run tests: PostgreSQL (only for coverage or cron)"
394-
if: (success() || failure()) && (env.LOG_COVERAGE || github.event_name == 'schedule')
393+
- name: "Run tests: PostgreSQL (only for cron)"
394+
if: (success() || failure()) && github.event_name == 'schedule'
395395
env:
396396
DB_DSN: "pgsql:host=postgres;dbname=atk4_test"
397397
DB_USER: atk4_test_user
@@ -401,8 +401,8 @@ jobs:
401401
php demos/_demo-data/create-db.php
402402
vendor/bin/behat -vv --config behat.yml.dist
403403
404-
- name: "Run tests: MSSQL (only for coverage or cron)"
405-
if: (success() || failure()) && (env.LOG_COVERAGE || github.event_name == 'schedule')
404+
- name: "Run tests: MSSQL (only for cron)"
405+
if: (success() || failure()) && github.event_name == 'schedule'
406406
env:
407407
DB_DSN: "sqlsrv:host=mssql;dbname=master;driverOptions[TrustServerCertificate]=1"
408408
DB_USER: sa
@@ -412,8 +412,8 @@ jobs:
412412
php demos/_demo-data/create-db.php
413413
vendor/bin/behat -vv --config behat.yml.dist
414414
415-
- name: "Run tests: Oracle (only for coverage or cron)"
416-
if: (success() || failure()) && (env.LOG_COVERAGE || github.event_name == 'schedule')
415+
- name: "Run tests: Oracle (only for cron)"
416+
if: (success() || failure()) && github.event_name == 'schedule'
417417
env:
418418
DB_DSN: "oci:dbname=oracle/xe"
419419
DB_USER: system

demos/_includes/DemoLookup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected function initQuickNewRecord(): void
3333
$buttonSeed = ['content' => $buttonSeed];
3434
}
3535

36-
$defaultSeed = [Button::class, 'class.disabled' => ($this->disabled || $this->readOnly)];
36+
$defaultSeed = [Button::class, 'class.disabled' => $this->disabled || $this->readOnly];
3737
$this->action = Factory::factory(array_merge($defaultSeed, $buttonSeed));
3838

3939
$vp = VirtualPage::addTo($this->form ?? $this->getOwner());

docs/form-control.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ You can set default value and interact with a form control using JavaScript::
4141
When used stand-alone, Form\Controls will produce a basic HTML (I have omitted id=)::
4242

4343
<div class="ui input">
44-
<input name="line" type="text" placeholder="" value="hello world"/>
44+
<input name="line" type="text" placeholder="" value="hello world" />
4545
</div>
4646

4747

js/src/components/inline-edit.component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const template = `
2323
v-model="value"
2424
@keyup="onKeyup"
2525
@focus="onFocus"
26-
@blur="onBlur"/><i class="icon"></i>
26+
@blur="onBlur" /><i class="icon"></i>
2727
</div>`;
2828

2929
export default {

js/src/components/item-search.component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const template = `<div class="atk-item-search" :class="inputCss">
2222
type="text" placeholder="Search..."
2323
@keyup="onKeyup"
2424
@keyup.esc="onEscape"
25-
name="atk-vue-search"/>
25+
name="atk-vue-search" />
2626
<i class="atk-search-icon" :class="classIcon"></i><span style="width: 12px; cursor: pointer" @click="onClear"></span>
2727
</div>
2828
`;

js/src/components/multiline/multiline.component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default {
1313
<atk-multiline-body @onTabLastRow="onTabLastRow" :fieldDefs="fieldData" :rowData="rowData" :deletables="getDeletables" :errors="errors"></atk-multiline-body>
1414
<sui-table-footer>
1515
<sui-table-row>
16-
<sui-table-header-cell/>
16+
<sui-table-header-cell />
1717
<sui-table-header-cell :colspan="getSpan" textAlign="right">
1818
<div is="sui-button-group">
1919
<sui-button size="small" @click.stop.prevent="onAdd" type="button" icon="plus" ref="addBtn" :disabled="isLimitReached"></sui-button>

js/src/components/query-builder/fomantic-ui-group.component.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</div>
5252
</div>
5353
<div class="vbq-group-body content">
54-
<query-builder-children v-bind="$props"/>
54+
<query-builder-children v-bind="$props" />
5555
</div>
5656
</div>
5757
</template>

js/src/components/query-builder/query-builder.component.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<input :form="form" :name="name" type="hidden" :value="value">
44
<vue-query-builder :rules="rules" v-model="query" :maxDepth="maxDepth" :labels="labels">
55
<template v-slot:default="slotProps">
6-
<query-builder-group v-bind="slotProps" :query.sync="query"/>
6+
<query-builder-group v-bind="slotProps" :query.sync="query" />
77
</template>
88
</vue-query-builder>
99
<template v-if="debug">

js/src/plugins/confirm.plugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import atkPlugin from './atk.plugin';
1414
export default class confirm extends atkPlugin {
1515
main() {
1616
let context = this;
17-
const $m = $('<div class="ui modal"/>')
17+
const $m = $('<div class="ui modal" />')
1818
.appendTo('body')
1919
.html(this.getDialogHtml(this.settings.message));
2020

js/src/plugins/create-modal.plugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default class createModal extends atkPlugin {
99
options.uri_options = {};
1010
}
1111
// create modal and add it to the DOM
12-
const $m = $('<div class="atk-modal ui modal"/>')
12+
const $m = $('<div class="atk-modal ui modal" />')
1313
.appendTo('body')
1414
.html(this.getDialogHtml(options.title));
1515

0 commit comments

Comments
 (0)