Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 552
TitelFeature LL-1063 - Abteilungen mit Orders dürfen nicht mehr löschbar sein
BeschreibungFolgende Lösung wurde jetzt im Tree umgesetzt: 1. Die APIs wurden abgesichert 1. Der Löschbutton wird immer angeboten 1. Bevor der Löschvorgang ausgeführt wird, wird der User erst nochmal gefragt, ob er löschen will 1. Wenn der Abteilung weder aktive User noch aktive/eingeplante Orders zugeordnet sind und die Abteilung auch keine Unterabteilungen hat, so wird die Löschung ohne weitere Rückmeldungen durchgeführt 1. Wenn der Abteilung aktive/eingeplante Orders zugeordnet sind oder wenn die Abteilung mindesten eine Unterabteilungen hat, wird nicht gelöscht und der User erhält eine entsprechende Meldung 1. Wenn der Abteilung aktive User zugeordnet sind erscheint eine zusätzliche Anfrage, die das mitteilt und fragt ob man dennoch löschen möchte siehe http://jira.learningsystem.de/browse/LL-1063
Statusmerged
Created at 2022-01-21T12:47:58.574Z
Updated at 2022-02-03T07:28:10.627Z
Source branchfeature/LL-1063-restrict-ou-deletion-to-orderless-ones
Target branchdevelop
AuthorGregor Gabriel
AssigneeSascha Immig

Discussion notes

changed the description Gregor Gabriel 2022-01-21T12:48:23.034Z
added 11 commits
  • 789a0ba3...b1e7de4b - 10 commits from branch develop
  • 503ed7ff - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…
Compare with previous version		 Gregor Gabriel 2022-01-25T07:15:19.082Z
added 14 commits
  • 503ed7ff...56095201 - 13 commits from branch develop
  • fd8fce24 - Merge branch 'develop' into 'feature/LL-1063-restrict-ou-deletion-to-orderless-ones'
Compare with previous version		 Sascha Immig 2022-01-26T13:28:22.281Z
added 1 commit
  • 6f8114a4 - + replaced this.tree by $('#data').jstree() in two cases, as it has thrown…
Compare with previous version		 Gregor Gabriel 2022-01-27T08:04:19.186Z
added 1 commit
  • 1d4ad768 - [skip-ci] addded english translations for vue components
Compare with previous version		 Gregor Gabriel 2022-01-28T09:36:37.851Z
added 1 commit
  • 8dd58142 - when creating a new node one can edit node name now
Compare with previous version		 Gregor Gabriel 2022-01-28T10:32:08.033Z
added 1 commit
  • 52f3c19c - added new node naming dialog in case one adds new node by button outside of the tree
Compare with previous version		 Gregor Gabriel 2022-01-28T10:51:24.419Z
merged Sascha Immig 2022-02-03T07:28:10.738Z
mentioned in commit 458a907c4fd311ab4ba7671d3f4efc4cee063e2f Sascha Immig 2022-02-03T07:28:11.130Z

Merge Commits

Title Id Author Created at Message
[skip-ci] addded english translations for vue components 1d4ad768eccf469a5665a6025ab6eeee4633464a TUV\gabrielg 2022-01-28T09:36:17.000Z [skip-ci] addded english translations for vue components
+ replaced group delete button with js confirm by confirmed submit button vue component 2b4ae24a62bf35e22a7d8f514222cbd5738fdbf4 TUV\gabrielg 2022-01-19T11:40:13.000Z + replaced group delete button with js confirm by confirmed submit button vue component + replaced unit delete button with js confirm by confirmed submit button vue component in old form + addded scope to Order class to filter for only not outdated orders
+ disabled group delete button, if group hast not outdated orders and placed… 4adfa40085698a592c17a4b38c4132706310b511 TUV\gabrielg 2022-01-20T08:42:50.000Z + disabled group delete button, if group hast not outdated orders and placed title to disabled button with explanation, why button is disabled
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… 503ed7ff96ac5428202680284184ff6c418fdcea TUV\gabrielg 2022-01-25T07:15:05.000Z Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1063-restrict-ou-deletion-to-orderless-ones # Conflicts: # resources/lang/de.json
added new node naming dialog in case one adds new node by button outside of the tree 52f3c19cf771eb2a3007fafe622658fa6450de91 TUV\gabrielg 2022-01-28T10:51:02.000Z added new node naming dialog in case one adds new node by button outside of the tree
+ replaced this.tree by $('#data').jstree() in two cases, as it has thrown… 6f8114a49c226fafae51ba510cffacc7be87368e TUV\gabrielg 2022-01-27T08:04:06.000Z + replaced this.tree by $('#data').jstree() in two cases, as it has thrown exceptions when methods were calles in external vue template
removed comments 789a0ba35d0830805cd78f189e26dea8fb31e327 TUV\gabrielg 2022-01-21T12:17:25.000Z removed comments
wip 86b55c0d44b80c6b98b826a2af7e037f5a37406a TUV\gabrielg 2022-01-21T09:29:39.000Z wip
when creating a new node one can edit node name now 8dd58142a5c70e14d21587bb7252e5733f3ec48a TUV\gabrielg 2022-01-28T10:31:53.000Z when creating a new node one can edit node name now
organization unit tree now provides tests if a unit has scheduled orders and… ad2ec31f824594d26bad294809ce0eda5ebdd731 TUV\gabrielg 2022-01-21T12:13:42.000Z organization unit tree now provides tests if a unit has scheduled orders and gives option to stop processing, if unit has users
+ removed unnecessary variable ba6aa7ce61b8cdbf05dc0dfab818da6c4f9d55fc TUV\gabrielg 2022-01-20T13:58:15.000Z + removed unnecessary variable
+ added permission checks to organization unit api for tree view e6c210ca0bc639bd0e8bcb1ffccfd6bbf08fbb0d TUV\gabrielg 2022-01-20T14:22:34.000Z + added permission checks to organization unit api for tree view
Merge branch 'develop' into 'feature/LL-1063-restrict-ou-deletion-to-orderless-ones' fd8fce2401e49216594d2d64e7dfe37c00608c85 Sascha Immig 2022-01-26T13:28:16.000Z Merge branch 'develop' into 'feature/LL-1063-restrict-ou-deletion-to-orderless-ones' # Conflicts: # resources/js/components/OrganizationUnitTree.vue # resources/views/admin/organizationUnits/index.blade.php