You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/05/12 14:21:14 UTC
airavata-php-gateway git commit: AIRAVATA-2324 allow longer acronyms,
shorter admin usernames
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master eebf53151 -> 753a34018
AIRAVATA-2324 allow longer acronyms, shorter admin usernames
Also require that acronyms contain only alphabetic characters, no
spaces.
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/753a3401
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/753a3401
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/753a3401
Branch: refs/heads/master
Commit: 753a3401877a0f4e08eed9cf8f67cfdb84a00c09
Parents: eebf531
Author: Marcus Christie <ma...@iu.edu>
Authored: Fri May 12 10:17:22 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Fri May 12 10:19:22 2017 -0400
----------------------------------------------------------------------
app/controllers/AdminController.php | 2 +-
app/views/account/dashboard.blade.php | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/753a3401/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index 6dd27bd..0153c62 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -460,7 +460,7 @@ class AdminController extends BaseController {
$inputs = Input::all();
$rules = array(
- "username" => "required|min:6",
+ "username" => "required",
"password" => "required|min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*]).*$/",
"confirm_password" => "required|same:password",
"email" => "required|email",
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/753a3401/app/views/account/dashboard.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/dashboard.blade.php b/app/views/account/dashboard.blade.php
index d59f78f..0899960 100644
--- a/app/views/account/dashboard.blade.php
+++ b/app/views/account/dashboard.blade.php
@@ -113,7 +113,8 @@
</div>
<div class="form-group required">
<label class="control-label">Gateway Acronym </label>
- <input type="text" name="gateway-acronym" class="gateway-acronym form-control" required="required" value="{{Input::old('gateway-acronym') }}" maxlength="6" data-toggle="popover" data-placement="left" data-content="Acronym cannot contain digits or special characters."/>
+ <input type="text" name="gateway-acronym" class="gateway-acronym form-control" required="required" value="{{Input::old('gateway-acronym') }}"
+ pattern="[A-Za-z]+" data-toggle="popover" data-placement="left" data-content="Acronym cannot contain digits or special characters or spaces."/>
</div>
<div class="form-group required">