From bf8670bc7d61157d866854ae7d8338089a8c4400 Mon Sep 17 00:00:00 2001 From: nelsonlaquet <nelsonlaquet@gmail.com> Date: Sun, 8 Sep 2013 03:16:43 -0500 Subject: [PATCH] fixed released_at validation on FF --- app/models/Commands/EditTrackCommand.php | 2 +- public/templates/account/track.html | 3 ++- spa.pony.fm.iml | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/models/Commands/EditTrackCommand.php b/app/models/Commands/EditTrackCommand.php index 656bb9dd..75cd8d11 100644 --- a/app/models/Commands/EditTrackCommand.php +++ b/app/models/Commands/EditTrackCommand.php @@ -39,7 +39,7 @@ $rules = [ 'title' => 'required|min:3|max:80', - 'released_at' => 'before:today' . ($this->_input['released_at'] != "" ? '|date' : ''), + 'released_at' => 'before:' . (date('Y-m-d', time() + (86400 * 2))) . (isset($this->_input['released_at']) && $this->_input['released_at'] != "" ? '|date' : ''), 'license_id' => 'required|exists:licenses,id', 'genre_id' => 'required|exists:genres,id', 'cover' => 'image|mimes:png|min_width:350|min_height:350', diff --git a/public/templates/account/track.html b/public/templates/account/track.html index 0ecdde92..28c6dd70 100644 --- a/public/templates/account/track.html +++ b/public/templates/account/track.html @@ -29,6 +29,7 @@ <label for="is_vocal" class="strong"><input ng-disabled="isSaving" ng-change="touchModel(); updateIsVocal()" id="is_vocal" type="checkbox" ng-model="edit.is_vocal" /> Is Vocal</label> <textarea ng-disabled="isSaving" ng-change="touchModel()" ng-show="edit.is_vocal" ng-animate="'fade'" placeholder="Lyrics (required)" id="lyrics" ng-model="edit.lyrics"></textarea> <div class="error">{{errors.lyrics}}</div> + <div class="error">{{errors.lyrics}}</div> </div> </div> <div class="row-fluid"> @@ -83,7 +84,7 @@ <label class="strong">Track Cover: </label> <pfm-image-upload set-image="setCover" image="edit.cover" /> </div> - <div class="form-row span6"> + <div class="form-row span6" ng-class="{'has-error': errors.released_at != null}"> <label for="released_at" class="strong">Release Date:</label> <input ng-disabled="isSaving" type="text" id="released_at" ui-date ng-model="edit.released_at" ng-change="touchModel()" ui-date-format="yy-mm-dd" /> <div class="error">{{errors.released_at}}</div> diff --git a/spa.pony.fm.iml b/spa.pony.fm.iml index dafc11e8..6ff7b7ed 100644 --- a/spa.pony.fm.iml +++ b/spa.pony.fm.iml @@ -21,6 +21,8 @@ <excludeFolder url="file://$MODULE_DIR$/vendor/guzzle/http" /> <excludeFolder url="file://$MODULE_DIR$/vendor/guzzle/parser" /> <excludeFolder url="file://$MODULE_DIR$/vendor/guzzle/stream" /> + <excludeFolder url="file://$MODULE_DIR$/vendor/intouch/laravel-newrelic" /> + <excludeFolder url="file://$MODULE_DIR$/vendor/intouch/newrelic" /> <excludeFolder url="file://$MODULE_DIR$/vendor/ircmaxell/password-compat" /> <excludeFolder url="file://$MODULE_DIR$/vendor/kriswallsmith/assetic" /> <excludeFolder url="file://$MODULE_DIR$/vendor/laravel/framework" /> @@ -69,6 +71,8 @@ <root url="file://$MODULE_DIR$/vendor/nikic/php-parser" /> <root url="file://$MODULE_DIR$/vendor/nesbot/carbon" /> <root url="file://$MODULE_DIR$/vendor/predis/predis" /> + <root url="file://$MODULE_DIR$/vendor/intouch/newrelic" /> + <root url="file://$MODULE_DIR$/vendor/intouch/laravel-newrelic" /> <root url="file://$MODULE_DIR$/vendor/laravel/framework" /> <root url="file://$MODULE_DIR$/vendor/monolog/monolog" /> <root url="file://$MODULE_DIR$/vendor/symfony/debug" /> @@ -107,6 +111,8 @@ <root url="file://$MODULE_DIR$/vendor/nikic/php-parser" /> <root url="file://$MODULE_DIR$/vendor/nesbot/carbon" /> <root url="file://$MODULE_DIR$/vendor/predis/predis" /> + <root url="file://$MODULE_DIR$/vendor/intouch/newrelic" /> + <root url="file://$MODULE_DIR$/vendor/intouch/laravel-newrelic" /> <root url="file://$MODULE_DIR$/vendor/laravel/framework" /> <root url="file://$MODULE_DIR$/vendor/monolog/monolog" /> <root url="file://$MODULE_DIR$/vendor/symfony/debug" />