Author: solomax
Date: Tue Jan 28 08:54:07 2014
New Revision: 1562009
URL: http://svn.apache.org/r1562009
Log:
Login error text message is being displayed;
"my Rooms" widget is fixed to fit it's area;
Code clean-up;
Modified:
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ErrorService.java
openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Modified:
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java?rev=1562009&r1=1562008&r2=1562009&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java
Tue Jan 28 08:54:07 2014
@@ -26,13 +26,14 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.basic.ErrorDao;
+import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.dao.server.SOAPLoginDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
import org.apache.openmeetings.db.dto.basic.ErrorResult;
import org.apache.openmeetings.db.dto.basic.SearchResult;
+import org.apache.openmeetings.db.entity.basic.ErrorType;
import org.apache.openmeetings.db.entity.basic.ErrorValue;
-import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
import org.apache.openmeetings.db.entity.server.RemoteSessionObject;
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.db.entity.user.User;
@@ -66,7 +67,7 @@ public class UserWebService {
@Autowired
private FieldManager fieldManager;
@Autowired
- private ErrorDao errorManagement;
+ private ErrorDao errorDao;
@Autowired
private OrganisationManager organisationManager;
@Autowired
@@ -75,6 +76,8 @@ public class UserWebService {
private AdminUserDao usersDao;
@Autowired
private MainService mainService;
+ @Autowired
+ private FieldLanguagesValuesDao labelDao;
/**
* load this session id before doing anything else Returns an Object of
Type
@@ -128,32 +131,27 @@ public class UserWebService {
* The SID from getSession
* @param errorid
* the error id (negative Value here!)
- * @param language_id
+ * @param langId
* The id of the language
*
* @return - error with the code given
*/
- public ErrorResult getErrorByCode(String SID, long errorid, long
language_id) {
+ public ErrorResult getErrorByCode(String SID, long errorid, long
langId) {
try {
if (errorid < 0) {
- ErrorValue eValues = errorManagement
- .getErrorValuesById(errorid *
(-1));
+ ErrorValue eValues = errorDao.get(-1 * errorid);
if (eValues != null) {
- Fieldlanguagesvalues errorValue =
fieldManager
-
.getFieldByIdAndLanguage(
-
eValues.getFieldvalues_id(), language_id);
- Fieldlanguagesvalues typeValue =
fieldManager
-
.getFieldByIdAndLanguage(errorManagement
-
.getErrorType(eValues.getErrortype_id())
-
.getFieldvalues_id(), language_id);
- if (errorValue != null) {
- return new ErrorResult(errorid,
errorValue.getValue(),
-
typeValue.getValue());
+ ErrorType eType =
errorDao.getErrorType(eValues.getErrortype_id());
+ log.debug("eValues.getFieldvalues_id()
= " + eValues.getFieldvalues_id());
+ log.debug("eValues.getErrorType() = " +
eType);
+ String eValue =
labelDao.getString(eValues.getFieldvalues_id(), langId);
+ String tValue =
labelDao.getString(eType.getFieldvalues_id(), langId);
+ if (eValue != null) {
+ return new ErrorResult(errorid,
eValue, tValue);
}
}
} else {
- return new ErrorResult(errorid,
- "Error ... please check your
input", "Error");
+ return new ErrorResult(errorid, "Error ...
please check your input", "Error");
}
} catch (Exception err) {
log.error("[getErrorByCode] ", err);
Modified:
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java?rev=1562009&r1=1562008&r2=1562009&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java
Tue Jan 28 08:54:07 2014
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.db.dao.basic;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.util.Date;
import java.util.List;
@@ -28,15 +30,13 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.entity.basic.ErrorType;
import org.apache.openmeetings.db.entity.basic.ErrorValue;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.transaction.annotation.Transactional;
@Transactional
public class ErrorDao {
- private static final Logger log = Red5LoggerFactory.getLogger(
- ErrorDao.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(ErrorDao.class, webAppRootKey);
@PersistenceContext
private EntityManager em;
@@ -128,11 +128,10 @@ public class ErrorDao {
return null;
}
- public ErrorValue getErrorValuesById(Long errorvalues_id) {
+ public ErrorValue get(Long id) {
try {
- TypedQuery<ErrorValue> query =
em.createNamedQuery("getErrorValuesById", ErrorValue.class);
- query.setParameter("errorvalues_id", errorvalues_id);
- query.setParameter("deleted", true);
+ TypedQuery<ErrorValue> query =
em.createNamedQuery("getErrorValueById", ErrorValue.class);
+ query.setParameter("id", id);
ErrorValue e = null;
try {
e = query.getSingleResult();
@@ -140,7 +139,7 @@ public class ErrorDao {
}
return e;
} catch (Exception ex2) {
- log.error("[getErrorValuesById]", ex2);
+ log.error("[get]", ex2);
}
return null;
}
Modified:
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java?rev=1562009&r1=1562008&r2=1562009&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
(original)
+++
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
Tue Jan 28 08:54:07 2014
@@ -30,9 +30,7 @@ import javax.persistence.Table;
@Entity
@NamedQueries({
- @NamedQuery(name = "getErrorValuesById", query = "select c from
ErrorValue as c "
- + " where c.errorvalues_id =
:errorvalues_id "
- + " AND c.deleted <> :deleted")
+ @NamedQuery(name = "getErrorValueById", query = "SELECT e FROM
ErrorValue e WHERE e.errorvalues_id = :id AND e.deleted = false")
})
@Table(name = "errorvalue")
public class ErrorValue implements Serializable {
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ErrorService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ErrorService.java?rev=1562009&r1=1562008&r2=1562009&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ErrorService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/remote/ErrorService.java
Tue Jan 28 08:54:07 2014
@@ -18,12 +18,13 @@
*/
package org.apache.openmeetings.remote;
-import org.apache.openmeetings.data.basic.FieldManager;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import org.apache.openmeetings.db.dao.basic.ErrorDao;
+import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.dto.basic.ErrorResult;
+import org.apache.openmeetings.db.entity.basic.ErrorType;
import org.apache.openmeetings.db.entity.basic.ErrorValue;
-import org.apache.openmeetings.db.entity.label.Fieldlanguagesvalues;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,13 +35,12 @@ import org.springframework.beans.factory
*
*/
public class ErrorService {
- private static final Logger log = Red5LoggerFactory.getLogger(
- ErrorService.class,
OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(ErrorService.class, webAppRootKey);
@Autowired
- private FieldManager fieldManager;
+ private FieldLanguagesValuesDao labelDao;
@Autowired
- private ErrorDao errorManagement;
+ private ErrorDao errorDao;
/**
* Gets an Error-Object by its id TODO: add error-code-handlers -20
@@ -51,28 +51,22 @@ public class ErrorService {
* @param errorid
* @return - ErrorResult object with the id given
*/
- public ErrorResult getErrorByCode(String SID, Long errorid, Long
language_id) {
+ public ErrorResult getErrorByCode(String SID, Long errorid, Long
langId) {
if (errorid < 0) {
- log.debug("errorid, language_id: " + errorid + "|" +
language_id);
- ErrorValue eValues =
errorManagement.getErrorValuesById(-1
- * errorid);
+ log.debug("errorid, language_id: " + errorid + "|" +
langId);
+ ErrorValue eValues = errorDao.get(-1 * errorid);
if (eValues != null) {
+ ErrorType eType =
errorDao.getErrorType(eValues.getErrortype_id());
log.debug("eValues.getFieldvalues_id() = " +
eValues.getFieldvalues_id());
- log.debug("eValues.getErrorType() = " +
errorManagement.getErrorType(eValues.getErrortype_id()));
- Fieldlanguagesvalues errorValue = fieldManager
-
.getFieldByIdAndLanguage(eValues.getFieldvalues_id(),
- language_id);
- Fieldlanguagesvalues typeValue = fieldManager
-
.getFieldByIdAndLanguage(errorManagement.getErrorType(eValues.getErrortype_id())
-
.getFieldvalues_id(), language_id);
- if (errorValue != null) {
- return new ErrorResult(errorid,
errorValue.getValue(),
- typeValue.getValue());
+ log.debug("eValues.getErrorType() = " + eType);
+ String eValue =
labelDao.getString(eValues.getFieldvalues_id(), langId);
+ String tValue =
labelDao.getString(eType.getFieldvalues_id(), langId);
+ if (eValue != null) {
+ return new ErrorResult(errorid, eValue,
tValue);
}
}
} else {
- return new ErrorResult(errorid,
- "Error ... please check your input",
"Error");
+ return new ErrorResult(errorid, "Error ... please check
your input", "Error");
}
return null;
}
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css?rev=1562009&r1=1562008&r2=1562009&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css Tue Jan 28
08:54:07 2014
@@ -113,7 +113,14 @@ html, body {
.clickable {
cursor: pointer;
}
-
+.dragbox-content .tableWrapper {
+ width: auto;
+ height: 100px;
+}
+.dragbox-content .tableWrapper .adminListTable {
+ max-width: none;
+ min-width: 0;
+}
div.tableWrapper {
background-color: #FFFFFF;
border: solid 1px #aacfe4;
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java?rev=1562009&r1=1562008&r2=1562009&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/WebSession.java
Tue Jan 28 08:54:07 2014
@@ -97,6 +97,7 @@ public class WebSession extends Abstract
private Locale browserLocale = null;
private int browserTZOffset = Integer.MIN_VALUE;
private Long recordingId;
+ private Long loginError = null;
private String externalType;
private static Set<Long> STRINGS_WITH_APP = new HashSet<Long>();
//FIXME need to be removed
public final static List<String> AVAILABLE_TIMEZONES =
Arrays.asList(TimeZone.getAvailableIDs());
@@ -122,6 +123,7 @@ public class WebSession extends Abstract
externalType = null;
tz = null;
browserTz = null;
+ loginError = null;
}
@Override
@@ -247,10 +249,16 @@ public class WebSession extends Abstract
if (u instanceof User) {
setUser((User)u);
return true;
+ } else if (u instanceof Long) {
+ loginError = (Long)u;
}
return false;
}
+ public Long getLoginError() {
+ return loginError;
+ }
+
public static WebSession get() {
return (WebSession)AbstractAuthenticatedWebSession.get();
}
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html?rev=1562009&r1=1562008&r2=1562009&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
Tue Jan 28 08:54:07 2014
@@ -62,7 +62,7 @@
</td>
</tr>
</table>
- <span wicket:id="feedback"></span>
+ <span wicket:id="feedback" class="error"></span>
<input type="submit" wicket:id="submit"
class="invisible-form-component"/>
</form>
</wicket:panel>
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1562009&r1=1562008&r2=1562009&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Tue Jan 28 08:54:07 2014
@@ -26,8 +26,10 @@ import static org.apache.openmeetings.we
import java.util.ArrayList;
import java.util.List;
+import org.apache.openmeetings.db.dao.basic.ErrorDao;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
import org.apache.openmeetings.db.dao.server.OAuth2Dao;
+import org.apache.openmeetings.db.entity.basic.ErrorValue;
import org.apache.openmeetings.db.entity.server.LdapConfig;
import org.apache.openmeetings.db.entity.server.OAuthServer;
import org.apache.openmeetings.web.app.Application;
@@ -81,7 +83,8 @@ public class SignInDialog extends Abstra
private ForgetPasswordDialog f;
private LdapConfig domain;
private String ldapConfigFileName;
-
+ private FeedbackPanel feedback = new FeedbackPanel("feedback");
+
public SignInDialog(String id) {
super(id, WebSession.getString(108));
add(form = new SignInForm("signin"));
@@ -183,7 +186,8 @@ public class SignInDialog extends Abstra
login = login + "@" + domain.getDomain();
}
OmAuthenticationStrategy strategy = getAuthenticationStrategy();
- if (WebSession.get().signIn(login, password,
ldapConfigFileName)) {
+ WebSession ws = WebSession.get();
+ if (ws.signIn(login, password, ldapConfigFileName)) {
setResponsePage(Application.get().getHomePage());
if (rememberMe) {
strategy.save(login, password,
ldapConfigFileName);
@@ -192,6 +196,13 @@ public class SignInDialog extends Abstra
}
} else {
strategy.remove();
+ if (ws.getLoginError() != null) {
+ ErrorValue eValue =
getBean(ErrorDao.class).get(-1 * ws.getLoginError());
+ if (eValue != null) {
+
error(WebSession.getString(eValue.getFieldvalues_id()));
+ target.add(feedback);
+ }
+ }
shake(target);
}
}
@@ -207,7 +218,7 @@ public class SignInDialog extends Abstra
if (WebSession.get().isSignedIn()) {
alreadyLoggedIn();
}
- add(new FeedbackPanel("feedback"));
+ add(feedback.setOutputMarkupId(true));
add(loginField = new RequiredTextField<String>("login",
new PropertyModel<String>(SignInDialog.this, "login")));
loginField.setLabel(Model.of(WebSession.getString(114)));
add(passField = new PasswordTextField("pass", new
PropertyModel<String>(SignInDialog.this, "password")).setResetPassword(true));
