Bug 28

+ restore user list grab space
+ insure default order is by user ID
https://www.argeo.org/bugzilla/show_bug.cgi?id=28

git-svn-id: https://svn.argeo.org/commons/trunk@6186 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 (file)
index 0000000..6bc10f9
Binary files /dev/null and b/security/plugins/org.argeo.security.ui.admin/icons/clear.gif differ

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 41d8ed036bae2cb18a17246f8b9b7c899efca8ad..6c8986b2ba16af973ceeda1660b8b2f7d901a6bc 100644 (file)
--- 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));