Fix error field highlighting, closes #90

pterodactyl · Sep 27, 2016 · a8fd728 · a8fd728
1 parent c95a058
commit a8fd728
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,19 @@
 # Changelog
 This file is a running track of new features and fixes to each version of the panel released starting with `v0.4.0`.
 
-## v0.4.0 (release scheduled ~ Mid September)
-Requires `Daemon@0.2.0`
+This project follows [Semantic Versioning](http://semver.org) guidelines.
 
-### New Features
+## v0.4.1
+
+### Changed
+* Overallocate fields are now auto-filled with a value of `0`
+
+### Fixed
+* Wrong error highlighting of overallocate fields on Node creation ([#90](https://github.com/Pterodactyl/Panel/issues/90), thanks [@schrej](https://github.com/schrej))
+
+## v0.4.0
+
+### Added
 * Task scheduler supporting customized CRON syntax or dropdown selected options. (currently only support command and power options)
 * Adds support for changing per-server database passwords from the panel.
 * Allows for use of IP rather than a FQDN if the node is not using SSL
@@ -15,10 +24,9 @@ Requires `Daemon@0.2.0`
 * Improved service management and setup on first install.
 * New terminal that supports ANSI color codes as well as cleaner output. You can also simply type `start` or `boot` to start your server rather than having to use the start button.
 
-### Bug Fixes
+### Fixed
 * Fixes password auto-generation on 'Manage Server' page. ([#67](https://github.com/Pterodactyl/Panel/issues/67), thanks [@ET-Bent](https://github.com/ET-Bent))
 * Fixes some overly verbose user output when an error occurs
-* **[Security Patch]** Fixes listing of server variables for server. Previously a bug made it possible to view settings for all servers, even if the user didn't own that server. ([#69](https://github.com/Pterodactyl/Panel/issues/69))
 * Prevent calling daemon until database call has been confirmed when changing default connection.
 * Fixes a few display issues relating to subusers and database management.
 * Fixes the server name in the header not linking to the server correctly. ([#79](https://github.com/Pterodactyl/Panel/issues/79), thanks [@xX1bumblebee1Xx](https://github.com/xX1bumblebee1Xx))
@@ -27,5 +35,11 @@ Requires `Daemon@0.2.0`
 * Fixes a bug where new files could not be created through the panel for a server. ([#85](https://github.com/Pterodactyl/Panel/issues/85), thanks [@xX1bumblebee1Xx](https://github.com/xX1bumblebee1Xx))
 * Fixes the exception handler to properly display and log exceptions that might occur rather than leaving a vague error. ([#81](https://github.com/Pterodactyl/Panel/issues/83))
 
-### General
+### Changed
 * Update Laravel to version `5.3` and update dependencies.
+
+### Deprecated
+* Requires Pterodactyl Daemon `v0.2.*`
+
+### Security
+* Fixes listing of server variables for server. Previously a bug made it possible to view settings for all servers, even if the user didn't own that server. ([#69](https://github.com/Pterodactyl/Panel/issues/69))
diff --git a/resources/views/admin/nodes/new.blade.php b/resources/views/admin/nodes/new.blade.php
@@ -99,7 +99,7 @@
                         <div class="form-group col-md-6 col-xs-6">
                             <label for="memory_overallocate" class="control-label">Overallocate</label>
                             <div class="input-group">
-                                <input type="text" name="memory_overallocate" class="form-control" value="{{ old('memory_overallocate') }}"/>
+                                <input type="text" name="memory_overallocate" class="form-control" value="{{ old('memory_overallocate', 0) }}"/>
                                 <span class="input-group-addon">%</span>
                             </div>
                         </div>
@@ -124,7 +124,7 @@
                         <div class="form-group col-md-6 col-xs-6">
                             <label for="disk_overallocate" class="control-label">Overallocate</label>
                             <div class="input-group">
-                                <input type="text" name="disk_overallocate" class="form-control" value="{{ old('disk_overallocate') }}"/>
+                                <input type="text" name="disk_overallocate" class="form-control" value="{{ old('disk_overallocate', 0) }}"/>
                                 <span class="input-group-addon">%</span>
                             </div>
                         </div>

diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php
@@ -200,9 +200,9 @@
 
         @if (count($errors) > 0)
             @foreach ($errors->all() as $error)
-                <?php preg_match('/^The\s(.*?)\s/', $error, $matches) ?>
+                <?php preg_match('/^The\s(.*?)\sfield/', $error, $matches) ?>
                 @if (isset($matches[1]))
-                    $('[name="{{ $matches[1] }}"]').parent().parent().addClass('has-error');
+                    $('[name="{{ str_replace(' ', '_', $matches[1]) }}"]').parent().parent().addClass('has-error');
                 @endif
             @endforeach
         @endif