Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Nov 18, 2016
2 parents 2b96860 + 29be700 commit b45fc4b
Show file tree
Hide file tree
Showing 47 changed files with 2,548 additions and 1,073 deletions.
25 changes: 16 additions & 9 deletions ...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/captcha/CaptchaPanel.java
View file
@@ -1,5 +1,7 @@
package com.evolveum.midpoint.gui.api.component.captcha;

import java.util.Random;

import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.extensions.markup.html.captcha.CaptchaImageResource;
Expand Down Expand Up @@ -66,12 +68,12 @@ protected final void onComponentTag(final ComponentTag tag) {
}

protected CaptchaImageResource createCaptchImageResource() {
return new CaptchaImageResource() {
return new CaptchaImageResource(randomString(), 48, 30) {
private static final long serialVersionUID = 1L;

@Override
protected byte[] render() {
String randomText = randomString(6, 8);
String randomText = randomString();
getChallengeIdModel().setObject(randomText);
return super.render();
}
Expand All @@ -85,16 +87,21 @@ public void invalidateCaptcha() {

static int randomInt(int min, int max)
{
return (int)(Math.random() * (max - min) + min);
return (int)(Math.random() * (max - min) + min);
}

static String randomString(int min, int max)
static String randomString()
{
int num = randomInt(min, max);
byte b[] = new byte[num];
for (int i = 0; i < num; i++)
b[i] = (byte)randomInt('a', 'z');
return new String(b);
return new Integer(randomInt(1000, 9999)).toString();
// for (int i = 0; i< length; i++){
//
// }
//
// int num = randomInt(min, max);
// byte b[] = new byte[num];
// for (int i = 0; i < num; i++)
// b[i] = (byte)randomInt('a', 'z');
// return new String(b);
}

public String getCaptchaText() {
Expand Down
7 changes: 6 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
View file
Expand Up @@ -648,13 +648,18 @@ public void hideMainPopup(AjaxRequestTarget target) {

private VisibleEnableBehaviour createUserStatusBehaviour(final boolean visibleIfLoggedIn) {
return new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
return SecurityUtils.getPrincipalUser() != null ? visibleIfLoggedIn : !visibleIfLoggedIn;
return isSideMenuVisible(visibleIfLoggedIn);
}
};
}

protected boolean isSideMenuVisible(boolean visibleIfLoggedIn) {
return SecurityUtils.getPrincipalUser() != null ? visibleIfLoggedIn : !visibleIfLoggedIn;
}

private void initDebugBarLayout() {
DebugBar debugPanel = new DebugBar(ID_DEBUG_PANEL);
Expand Down
3 changes: 2 additions & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
View file
Expand Up @@ -265,7 +265,8 @@ public enum Channel {
REST(SchemaConstants.CHANNEL_REST_URI),
INIT(SchemaConstants.CHANNEL_GUI_INIT_URI),
USER(SchemaConstants.CHANNEL_GUI_USER_URI),
SELF_REGISTRATION(SchemaConstants.CHANNEL_GUI_SELF_REGISTRATION_URI);
SELF_REGISTRATION(SchemaConstants.CHANNEL_GUI_SELF_REGISTRATION_URI),
RESET_PASSWORD(SchemaConstants.CHANNEL_GUI_RESET_PASSWORD_URI);

private String channel;

Expand Down
6 changes: 4 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
View file
Expand Up @@ -46,9 +46,11 @@ public class SearchFactory {

static {
SEARCHABLE_OBJECTS.put(ObjectType.class, Arrays.asList(
new ItemPath(ObjectType.F_NAME)));
new ItemPath(ObjectType.F_NAME),
new ItemPath(ObjectType.F_LIFECYCLE_STATE)));
SEARCHABLE_OBJECTS.put(FocusType.class, Arrays.asList(
new ItemPath(FocusType.F_ACTIVATION, ActivationType.F_ADMINISTRATIVE_STATUS)));
new ItemPath(FocusType.F_ACTIVATION, ActivationType.F_ADMINISTRATIVE_STATUS),
new ItemPath(FocusType.F_ACTIVATION, ActivationType.F_EFFECTIVE_STATUS)));
SEARCHABLE_OBJECTS.put(UserType.class, Arrays.asList(
new ItemPath(UserType.F_GIVEN_NAME),
new ItemPath(UserType.F_FAMILY_NAME),
Expand Down
188 changes: 0 additions & 188 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
View file

This file was deleted.

28 changes: 26 additions & 2 deletions ...ge/forgetpassword/PageForgetPassword.html → ...ge/forgetpassword/PageForgotPassword.html
View file
Expand Up @@ -22,11 +22,13 @@
<wicket:extend>

<div class="row">

<div class="col-md-offset-2 col-md-8 col-lg-offset-4 col-lg-4">
<div class="panel panel-default" style="margin-top: 120px;">
<div class="panel-body">
<form wicket:id="pwdresetform" class="form-horizontal">
<div class="form-group">
<div wicket:id="usernameContainer">
<label class="col-md-4 col-lg-4 control-label">
<wicket:message key="PageForgetPassword.username"/>
</label>
Expand All @@ -35,8 +37,10 @@
<input wicket:id="username" type="text" class="form-control input-sm focus-username"
wicket:message="placeholder:PageForgetPassword.username">
</div>
</div>
</div>
<div class="form-group">
<div wicket:id="emailContainer">
<label class="col-md-4 col-lg-4 control-label">
<wicket:message key="PageForgetPassword.email"/>
</label>
Expand All @@ -46,14 +50,34 @@
wicket:message="placeholder:PageForgetPassword.email">
</div>


</div>
</div>

<input type="submit" class="btn btn-primary pull-right" wicket:message="value:PageForgetPassword.resetPassword"/>
<div class="pull-right">
<a class="btn btn-default" wicket:id="back">
<label class="col-md-4 col-lg-4 control-label">
<wicket:message key="pageAdminFocus.button.back"/>
</label>
</a>

<a class="btn btn-primary" wicket:id="submitButton">
<label class="col-md-4 col-lg-4 control-label">
<wicket:message key="PageForgetPassword.resetPassword"/>
</label>
</a>

</div>
</form>

<div style="text-align: center">
<h2 wicket:id="resetPasswordInfo"></h2>
</div>
</div>

</div>
</div>


</div>


Expand Down

0 comments on commit b45fc4b

Please sign in to comment.