From 767d7852e7c346b8e202995e2a00fe6fad5fc033 Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Thu, 21 Mar 2013 12:15:07 +0000
Subject: [PATCH] Merge Add sorting to user list table + Restore Grab excess
 space for the table + Default order by user ID Bug 28 :
 https://www.argeo.org/bugzilla/show_bug.cgi?id=28

git-svn-id: https://svn.argeo.org/commons/branches/1.x@6187 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../icons/clear.gif                           | Bin 0 -> 545 bytes
 .../security/ui/admin/views/UsersView.java    |  22 ++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 security/plugins/org.argeo.security.ui.admin/icons/clear.gif

diff --git a/security/plugins/org.argeo.security.ui.admin/icons/clear.gif b/security/plugins/org.argeo.security.ui.admin/icons/clear.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6bc10f9d07cbd44b89abef5dc3732b76491db431
GIT binary patch
literal 545
zcmZ?wbhEHb6krfwc*el6XlmuWNoDgVmCx!eUN)n4PJijj*$oS)RBc?`zIJ}gzV(xK
ztm@setn0wWDZAHB*u8e*zrVld^p!51Ub}N;@3qt0ub<s@diSC;dzYNszkK`RwzGSe
zT|2pT&D7E}yB9yYdgSxF=O?z!zj12E_fK!WynlK3%+7n~_B^<F;L(*MkFFeja{c7z
zx6kgJ+;;c$j=QIK-aohJ;l+cWUO)Nx>hbqaZ-0IJ^!vxxKfiwb`}^na$!!lV9Q^wB
z*~gcUzP)|+_097iAK!j^^Zf76@BjY%{`>papPxVe{rU6%-@pH0z%X=x;!hSv1_n0<
z9gvejal*h}*WlLF+|t_C#M{}`-r?HU&)dW0;@~V`=E~L1XJ%?@@8rtgBkX9r+*p*m
zoyW=6NXb@&r-#GD#@fzOnxmalSyNF#QiijKO<r9?T~30nokdGu%|cB|sE6G^PgPG(
loS~h`P*+DqSC+9y&`Mj|Tw9E_hxzL_X1DL(dU_fetN~;H&L#i=

literal 0
HcmV?d00001

diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java
index 41d8ed036..6c8986b2b 100644
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/views/UsersView.java
@@ -78,10 +78,10 @@ public class UsersView extends ViewPart implements ArgeoNames {
 
 	private TableViewer viewer;
 	private Text filterTxt;
-	private final static String FILTER_HELP_MSG = "Enter filter criterion "
-			+ "separated by a space (on user ID, name and E-mail";
+	private final static String FILTER_HELP_MSG = "Type filter criterion "
+			+ "separated by a space (on user ID, name and E-mail)";
 	private final static Image FILTER_RESET = SecurityAdminPlugin
-			.getImageDescriptor("icons/users.gif").createImage();
+			.getImageDescriptor("icons/clear.gif").createImage();
 
 	private Session session;
 
@@ -123,6 +123,11 @@ public class UsersView extends ViewPart implements ArgeoNames {
 	protected TableViewer createTableViewer(final Composite parent) {
 
 		Table table = new Table(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
+		GridData gd = new GridData(SWT.FILL, SWT.FILL, false, false);
+		gd.grabExcessHorizontalSpace = true;
+		gd.grabExcessVerticalSpace = true;
+		table.setLayoutData(gd);
+
 		TableViewer viewer = new TableViewer(table);
 		table.setLinesVisible(true);
 		table.setHeaderVisible(true);
@@ -311,7 +316,8 @@ public class UsersView extends ViewPart implements ArgeoNames {
 	}
 
 	public void refresh() {
-		viewer.refresh();
+		// viewer.refresh();
+		refreshFilteredList();
 	}
 
 	protected String getProperty(Node userProfile, String name)
@@ -335,7 +341,8 @@ public class UsersView extends ViewPart implements ArgeoNames {
 
 		@Override
 		public void onEvent(EventIterator events) {
-			viewer.refresh();
+			// viewer.refresh();
+			refreshFilteredList();
 		}
 	}
 
@@ -343,7 +350,8 @@ public class UsersView extends ViewPart implements ArgeoNames {
 
 		@Override
 		public void onEvent(EventIterator events) {
-			viewer.refresh();
+			// viewer.refresh();
+			refreshFilteredList();
 		}
 	}
 
@@ -492,7 +500,7 @@ public class UsersView extends ViewPart implements ArgeoNames {
 			}
 		}
 
-		Ordering order = factory.descending(factory.propertyValue(
+		Ordering order = factory.ascending(factory.propertyValue(
 				bundleArtifactsSelector, ARGEO_USER_ID));
 		// Ordering order2 = factory.ascending(factory.propertyValue(
 		// bundleArtifactsSelector, ARGEO_PRIMARY_EMAIL));
-- 
2.30.2