Skip to content

fix(systemtags): followup #48786; Types::STRING and notemin-height #48965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 2 commits into from
Oct 29, 2024
Merged

fix(systemtags): followup #48786; Types::STRING and notemin-height #48965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22d674b
fix(core): use Types::STRING in etag systemtag migration
skjnldsv Oct 29, 2024
96583c9
fix(systemtags): set min height on picker note
skjnldsv Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions apps/systemtags/src/components/SystemTagPicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,12 @@ export default defineComponent({
bottom: 0;
padding-block: 8px;

:deep(.notecard) {
// min 2 lines of text to avoid jumping
min-height: 2lh;
align-items: center;
}

& > div {
margin: 0 !important;
}
Expand Down
3 changes: 2 additions & 1 deletion core/Migrations/Version31000Date20241018063111.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
namespace OC\Core\Migrations;

use Closure;
use Doctrine\DBAL\Types\Types;
use OCP\DB\ISchemaWrapper;
use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
Expand Down Expand Up @@ -41,7 +42,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
$table = $schema->getTable('systemtag');

if (!$table->hasColumn('etag')) {
$table->addColumn('etag', 'string', [
$table->addColumn('etag', Types::STRING, [
'notnull' => false,
'length' => 32,
]);
Expand Down
2 changes: 2 additions & 0 deletions dist/6028-6028.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 dist/8699-8699.js.license → dist/6028-6028.js.license
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions dist/6028-6028.js.map
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/6028-6028.js.map.license
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6028-6028.js.license
Loading