mirror of
https://github.com/scm-manager/scm-manager.git
synced 2026-06-20 17:21:49 +02:00
added field validation for repository, user and group names
This commit is contained in:
@@ -68,6 +68,7 @@
|
||||
<script type="text/javascript" src="resources/js/util/sonia.util.link.js"></script>
|
||||
|
||||
<!-- sonia.override -->
|
||||
<script type="text/javascript" src="resources/js/override/ext.form.vtypes.js"></script>
|
||||
<script type="text/javascript" src="resources/js/override/ext.form.field.js"></script>
|
||||
<script type="text/javascript" src="resources/js/override/ext.util.format.js"></script>
|
||||
<script type="text/javascript" src="resources/js/override/ext.data.store.js"></script>
|
||||
|
||||
@@ -40,7 +40,8 @@ Sonia.group.PropertiesFormPanel = Ext.extend(Sonia.group.FormPanel, {
|
||||
name: 'name',
|
||||
allowBlank: false,
|
||||
readOnly: this.item != null,
|
||||
helpText: this.nameHelpText
|
||||
helpText: this.nameHelpText,
|
||||
vtype: 'name'
|
||||
},{
|
||||
fieldLabel: this.descriptionText,
|
||||
name: 'description',
|
||||
|
||||
@@ -38,8 +38,9 @@ if (Ext.form.VTypes){
|
||||
pluginurlText: 'Dieses Feld sollte eine URL enthalten. Format: \n\
|
||||
"http://plugins.scm-manager.org/scm-plugin-backend/api/{version}/plugins?os={os}&arch={arch}&snapshot=false"',
|
||||
|
||||
// sonia.user.js
|
||||
passwordText: 'Die Passwörter stimmen nicht überein!'
|
||||
passwordText: 'Die Passwörter stimmen nicht überein!',
|
||||
nameTest: 'Der Name ist invalid.',
|
||||
usernameText: 'Der Benutzername ist invalid.'
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
/* *
|
||||
* Copyright (c) 2010, Sebastian Sdorra
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice,
|
||||
* this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of SCM-Manager; nor the names of its
|
||||
* contributors may be used to endorse or promote products derived from this
|
||||
* software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* http://bitbucket.org/sdorra/scm-manager
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
Ext.apply(Ext.form.VTypes, {
|
||||
|
||||
// passord validator
|
||||
|
||||
password: function(val, field) {
|
||||
if (field.initialPassField) {
|
||||
var pwd = Ext.getCmp(field.initialPassField);
|
||||
return (val == pwd.getValue());
|
||||
}
|
||||
return true;
|
||||
},
|
||||
|
||||
passwordText: 'The passwords entered do not match!',
|
||||
|
||||
// name validator
|
||||
|
||||
name: function(val){
|
||||
return /^[A-z0-9\.\-_]+$/.test(val);
|
||||
},
|
||||
|
||||
nameText: 'The name is invalid.',
|
||||
|
||||
// username validator
|
||||
|
||||
username: function(val){
|
||||
return val.match(/^[A-z0-9\.\-_@]+$/);
|
||||
},
|
||||
|
||||
usernameText: 'The username is invalid.'
|
||||
|
||||
});
|
||||
@@ -43,7 +43,8 @@ Sonia.repository.PropertiesFormPanel = Ext.extend(Sonia.repository.FormPanel, {
|
||||
name: 'name',
|
||||
readOnly: update,
|
||||
allowBlank: false,
|
||||
helpText: this.nameHelpText
|
||||
helpText: this.nameHelpText,
|
||||
vtype: 'name'
|
||||
},{
|
||||
fieldLabel: this.typeText,
|
||||
name: 'type',
|
||||
|
||||
@@ -57,7 +57,8 @@ Sonia.user.FormPanel = Ext.extend(Sonia.rest.FormPanel,{
|
||||
name: 'name',
|
||||
allowBlank: false,
|
||||
readOnly: this.item != null,
|
||||
helpText: this.usernameHelpText
|
||||
helpText: this.usernameHelpText,
|
||||
vtype: 'username'
|
||||
},{
|
||||
fieldLabel: this.displayNameText,
|
||||
name: 'displayName',
|
||||
|
||||
@@ -53,15 +53,3 @@ Sonia.user.DefaultPanel = {
|
||||
html: 'Add or select an User'
|
||||
};
|
||||
|
||||
|
||||
// passord validator
|
||||
Ext.apply(Ext.form.VTypes, {
|
||||
password: function(val, field) {
|
||||
if (field.initialPassField) {
|
||||
var pwd = Ext.getCmp(field.initialPassField);
|
||||
return (val == pwd.getValue());
|
||||
}
|
||||
return true;
|
||||
},
|
||||
passwordText: 'The passwords entered do not match!'
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user