You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/07/20 14:58:17 UTC
[23/43] syncope git commit: Fix layout on smoller monitors + fix
notification task search
Fix layout on smoller monitors + fix notification task search
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/14649394
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/14649394
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/14649394
Branch: refs/heads/2_0_NO_JAXB
Commit: 14649394a351d087c4c2627bb4fa45f5fc3406dd
Parents: 5d95efa
Author: fmartelli <fa...@gmail.com>
Authored: Wed Jul 13 10:18:48 2016 +0200
Committer: fmartelli <fa...@gmail.com>
Committed: Wed Jul 13 10:18:48 2016 +0200
----------------------------------------------------------------------
.../META-INF/resources/css/syncopeConsole.css | 39 +++++++++++++-------
.../core/persistence/jpa/dao/JPATaskDAO.java | 3 +-
2 files changed, 28 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/14649394/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css b/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
index cba9e38..c852882 100644
--- a/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
+++ b/client/console/src/main/resources/META-INF/resources/css/syncopeConsole.css
@@ -219,7 +219,7 @@ a.help span a {
}
.modal-body {
- max-height: 670px;
+ max-height: 500px;
overflow-y: auto;
}
@@ -234,14 +234,6 @@ a.help span a {
margin-bottom: 10px !important;
}
-.wizard-view {
- max-height: 480px;
- height: 480px;
- overflow-y: auto;
- overflow-x: hidden;
- padding: 0px 5px 0px 5px;
-}
-
div.wizard-view div.wizard-view{
max-height: 380px;
height: 380px;
@@ -271,11 +263,31 @@ div.wizard-view div.wizard-view{
position: relative;
}
+.wizard-view {
+ padding: 0px 5px;
+}
+
.wizard-form {
- height:560px;
+ height:480px;
position: relative;
}
+.wizard-form > div {
+ max-height: 440px;
+ height: 440px;
+ overflow-y: auto;
+ overflow-x: hidden;
+ padding: 0px;
+}
+
+.box-body .wizard-form {
+ height:400px !important;
+}
+
+.box-body .wizard-form > div {
+ height: 360px !important;
+}
+
.wizard-buttons {
padding: 10px 0px 5px 0px;
position: absolute;
@@ -325,11 +337,12 @@ span.overridable div.checkbox label div div.toggle-group label {
}
div#outer.modal-lg, div#utilityModal.modal-lg, section#notifications .modal-lg {
- width: 1200px;
+ max-width: 1200px;
+ width: 97%;
}
.details {
- max-height: 380px;
+ max-height: 401px;
overflow-x: hidden;
overflow-y: auto;
display: block
@@ -358,7 +371,7 @@ div.information{
clear: both;
float:none;
position: absolute;
- bottom: -20px;
+ bottom: -90px;
left: 0px;
padding: 2px;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/14649394/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java
index 1f5db3b..8ca3297 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java
@@ -153,7 +153,8 @@ public class JPATaskDAO extends AbstractDAO<Task> implements TaskDAO {
queryString.append("AND t.notification=:notification ");
}
if (anyTypeKind != null && entityKey != null) {
- queryString.append("AND t.anyTypeKind=:anyTypeKind AND t.entityKey=:entityKey ");
+ queryString.append("AND t.anyTypeKind=:anyTypeKind AND t.").
+ append(type == TaskType.NOTIFICATION ? "anyKey" : "entityKey").append("=:entityKey ");
}
return queryString;