Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 22
Titelfields disabled for fixed pages
Beschreibung
Statusmerged
Created at 2018-09-18T12:55:12.595Z
Updated at 2018-09-25T09:07:54.096Z
Source branchfeature/add_restrictions_on_fixed_pages
Target branchdevelop
AuthorZoltan Schnepf
AssigneeSascha Immig

Discussion notes

wäre nicht einfacher `['readonly' => $page->fixed, 'disabled' => $page->fixed]` direkt zu nehmen... ? spart Codedopplung... Sascha Immig 2018-09-18T15:01:33.771Z
assigned to @pociotm Sascha Immig 2018-09-18T15:02:00.635Z
Hier ist es lesbarer, wenn wir das `can` und `if` zusammenfassen: ``` @if(auth()->user()->can(\App\Enums\Permissions::DELETE_PAGES) && ! $page->fixed) ``` Marcel Pociot 2018-09-19T07:33:08.042Z
Die Abfrage auf die `$page` Variable führt beim anlegen einer neuen Seite zu einem Fehler, weil es dort keine `$page` Variable gibt. Marcel Pociot 2018-09-19T07:37:27.869Z
assigned to @schnepfz Marcel Pociot 2018-09-19T08:58:58.305Z
Hier auch... :) Sascha Immig 2018-09-19T09:11:05.996Z
added 2 commits
  • dbb1c75d - WIP - todo: replace fake content
  • 0a6587dd - Merge branch 'feature/migration_add_fixed_to_pages' into feature/add_restrictions_on_fixed_pages
Compare with previous version
Sascha Immig 2018-09-19T09:15:41.216Z
marked as a **Work In Progress** from dbb1c75dc71ebec4b28f517d3fecc6ba1c893762 Sascha Immig 2018-09-19T09:15:41.422Z
added 2 commits
  • 9fdf4988 - Merge branch 'feature/migration_add_fixed_to_pages' into…
  • a826db59 - Merge branch 'feature/add_restrictions_on_fixed_pages' of…
Compare with previous version
Sascha Immig 2018-09-19T11:20:16.296Z
added 2 commits
  • cae17a2b - Merge branch 'feature/add_restrictions_on_fixed_pages' of…
  • b98833a7 - Merge branch 'feature/add_restrictions_on_fixed_pages' of…
Compare with previous version
Sascha Immig 2018-09-19T11:23:54.375Z
added 1 commit
  • 3d3b71d6 - bugfix
Compare with previous version
Sascha Immig 2018-09-19T11:26:19.279Z
added 2 commits
  • 559283bf - used correct command for rollback
  • f9e334f1 - made 'fixed' fillable to work with the ORM
Compare with previous version
Sascha Immig 2018-09-21T07:24:02.787Z
added 1 commit
  • 8339022b - corrected markup for dummy-texts: accidently used some old markup
Compare with previous version
Sascha Immig 2018-09-21T14:08:38.520Z
changed this line in version 8 of the diff Zoltan Schnepf 2018-09-24T06:46:05.028Z
changed this line in version 8 of the diff Zoltan Schnepf 2018-09-24T06:46:05.221Z
changed this line in version 8 of the diff Zoltan Schnepf 2018-09-24T06:46:05.429Z
changed this line in version 8 of the diff Zoltan Schnepf 2018-09-24T06:46:05.530Z
added 1 commit
  • 71a758d2 - discussions resolved
Compare with previous version
Zoltan Schnepf 2018-09-24T06:46:05.664Z
umgebaut Zoltan Schnepf 2018-09-24T06:49:21.240Z
ganz recht, umgebaut Zoltan Schnepf 2018-09-24T06:50:12.848Z
gefixed Zoltan Schnepf 2018-09-24T06:50:28.239Z
umgebaut Zoltan Schnepf 2018-09-24T06:50:56.775Z
resolved all discussions Zoltan Schnepf 2018-09-24T06:50:57.552Z
nur der Vollständigkeit halber: wenn ich diese Zeile auflöse erhalte ich `if (true) ? true : false`... das geht kürzer :) Sascha Immig 2018-09-25T07:56:07.471Z
unmarked as a **Work In Progress** Sascha Immig 2018-09-25T07:59:57.882Z
changed this line in version 9 of the diff Zoltan Schnepf 2018-09-25T08:59:15.164Z
added 1 commit
  • 935b02da - discussion resolved
Compare with previous version
Zoltan Schnepf 2018-09-25T08:59:15.309Z
aber selbstverfreilich !! hatte zuvor mit: $readOnly = (isset($page) && $page->fixed) ? "true" : "false" gespielt, weil ich dachte, dass ich den Wert als String übergeben muss... Danach habe ich lediglich die Anführungszeichen entfernt und das Unding lässigerweise in der verkrüppelten Form vergessen. Verzeihung! Zoltan Schnepf 2018-09-25T09:00:38.477Z
resolved all discussions Zoltan Schnepf 2018-09-25T09:00:39.263Z
assigned to @immigs Zoltan Schnepf 2018-09-25T09:01:39.399Z

Merge Commits

Title Id Author Created at Message
Merge branch 'feature/migration_add_fixed_to_pages' into feature/add_restrictions_on_fixed_pages 0a6587dd002a2f1fc1648ce071686df4f9009952 TUV\immigs 2018-09-19T09:15:14.000Z Merge branch 'feature/migration_add_fixed_to_pages' into feature/add_restrictions_on_fixed_pages
fields disabled for fixed pages 1eba96df14fed481d93b0d9b9d2c30a1d6e98b0c schnepfz 2018-09-18T12:52:25.000Z fields disabled for fixed pages
bugfix 3d3b71d66c807f4dd0313e8f1a4a05902304c587 TUV\immigs 2018-09-19T11:26:11.000Z bugfix
used correct command for rollback 559283bfe185c690dfe00739a80ec8e5b30b6faf TUV\immigs 2018-09-21T07:08:33.000Z used correct command for rollback
discussions resolved 71a758d2f7fe3201d1307c39607b83e5d579f23b schnepfz 2018-09-24T06:45:51.000Z discussions resolved
corrected markup for dummy-texts: accidently used some old markup 8339022b330356548839fc80875c7fb42c5466a5 TUV\immigs 2018-09-21T14:08:29.000Z corrected markup for dummy-texts: accidently used some old markup
discussion resolved 935b02da7d1a221d5192bf4c740a80e888d13603 schnepfz 2018-09-25T08:59:11.000Z discussion resolved
Merge branch 'feature/migration_add_fixed_to_pages' into… 9fdf49883e4356a06180feac6b558494441add36 TUV\immigs 2018-09-19T11:19:33.000Z Merge branch 'feature/migration_add_fixed_to_pages' into feature/add_restrictions_on_fixed_pages: Exchanged raw SQL for Eloquent ORM. Added new dummy-content.
Merge branch 'feature/add_restrictions_on_fixed_pages' of… a826db59a312cc4ecf11d7435758c36f05d338ff TUV\immigs 2018-09-19T11:19:56.000Z Merge branch 'feature/add_restrictions_on_fixed_pages' of https://gitlab.learningsystem.de/lms/seventeen into feature/add_restrictions_on_fixed_pages
Merge branch 'feature/add_restrictions_on_fixed_pages' of… b98833a78ebc1f24e9f7c9f618fea8b4ef6a0cb2 TUV\immigs 2018-09-19T11:23:35.000Z Merge branch 'feature/add_restrictions_on_fixed_pages' of https://gitlab.learningsystem.de/lms/seventeen into feature/add_restrictions_on_fixed_pages
Merge branch 'feature/add_restrictions_on_fixed_pages' of… cae17a2ba40dd24ea2ea9d69e498d69eec11360f TUV\immigs 2018-09-19T11:23:14.000Z Merge branch 'feature/add_restrictions_on_fixed_pages' of https://gitlab.learningsystem.de/lms/seventeen into feature/add_restrictions_on_fixed_pages
WIP - todo: replace fake content dbb1c75dc71ebec4b28f517d3fecc6ba1c893762 schnepfz 2018-09-18T09:30:37.000Z WIP - todo: replace fake content
made 'fixed' fillable to work with the ORM f9e334f1ee68e12e7a05c5813f1c6aae03a73b27 TUV\immigs 2018-09-21T07:23:47.000Z made 'fixed' fillable to work with the ORM