sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes #362

This commit is contained in:
Dane Everitt 2017-03-30 16:30:22 -04:00
parent da003efb03
commit 9106971565
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -6,9 +6,12 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
## v0.6.0-pre.8 (Courageous Carniadactylus) ## v0.6.0-pre.8 (Courageous Carniadactylus)
### Fixed ### Fixed
* `[pre.7]` — Fixes bug with subuser checkbox display. * `[pre.7]` — Fixes bug with subuser checkbox display.
* `[pre.7]` — Fixes bug with injected JS that was causing `<!DOCTYPE html>` to be ignored in templates.
* `[pre.7]` — Fixes exception thrown when trying to delete a node due to a misnamed model.
### Changed ### Changed
* Subuser permissions are now stored in `Permission::list()` to make views way cleaner and make adding to views significantly cleaner. * Subuser permissions are now stored in `Permission::list()` to make views way cleaner and make adding to views significantly cleaner.
* `[pre.7]` — Sidebar for file manager now is a single link rather than a dropdown.
## v0.6.0-pre.7 (Courageous Carniadactylus) ## v0.6.0-pre.7 (Courageous Carniadactylus)
### Fixed ### Fixed

15
app/Repositories/NodeRepository.php
View File

@ -277,13 +277,9 @@ class NodeRepository
throw new DisplayException('You cannot delete a node with servers currently attached to it.'); throw new DisplayException('You cannot delete a node with servers currently attached to it.');
} }
DB::beginTransaction(); DB::transaction(function () use ($node) {
try {
// Unlink Database Servers // Unlink Database Servers
Models\DatabaseServer::where('linked_node', $node->id)->update([ Models\DatabaseHost::where('node_id', $node->id)->update(['node_id' => null]);
'linked_node' => null,
]);
// Delete Allocations // Delete Allocations
Models\Allocation::where('node_id', $node->id)->delete(); Models\Allocation::where('node_id', $node->id)->delete();
@ -293,11 +289,6 @@ class NodeRepository
// Delete Node // Delete Node
$node->delete(); $node->delete();
});
DB::commit();
} catch (\Exception $ex) {
DB::rollback();
throw $ex;
}
} }
} }