Merge branch '808-users-sorting-by-name-not-available' into 'master'

Resolve "Users sorting by name not available"

Closes #808

See merge request !864

CHANGELOG

@@ -25,6 +25,7 @@ minerva (14.0.0~alpha.0) unstable; urgency=low
   * Small improvement: information about deprecated columns in data overlay is 
     visible in overlay list (#838)
   * Small improvement: publication list is resizable (#740)
+  * Small improvement: user list on project edit dialog is sortable (#808)
   * Bug fix: export to CellDesigner of reaction with two modifiers connected
     with boolean operator resulted was skipping some layout information
   * Bug fix: reaction in SBGNML file containing two products was improperly

frontend-js/src/main/js/gui/admin/EditProjectDialog.js

@@ -620,7 +620,8 @@ EditProjectDialog.prototype.createUserPrivilegeColumns = function () {
 
   var configuration = self.getConfiguration();
   self._userPrivilegeColumns = [{
-    title: "Name"
+    title: "Name",
+    orderable: true
   }];
   var privilegeTypes = configuration.getPrivilegeTypes();
   for (var i = 0; i < privilegeTypes.length; i++) {
@@ -628,7 +629,8 @@ EditProjectDialog.prototype.createUserPrivilegeColumns = function () {
     if (type.getObjectType() === "Project") {
       self._userPrivilegeColumns.push({
         "title": type.getCommonName(),
-        privilegeType: type
+        privilegeType: type,
+        orderable: false
       });
     }
   }
@@ -739,7 +741,7 @@ EditProjectDialog.prototype.initUsersTab = function () {
   var columns = self.createUserPrivilegeColumns();
   $(usersTable).DataTable({
     columns: columns,
-    ordering: false
+    ordering: true
   });
   return Promise.resolve();
 };

model/src/main/java/lcsb/mapviewer/model/map/ElementInFewParentsException.java

-package lcsb.mapviewer.model.map;
-
-/**
- * Exception thrown when one element has more then one parent.
- * 
- * @author Piotr Gawron
- * 
- */
-public class ElementInFewParentsException extends Exception {
-  /**
-   * 
-   */
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * Default constructor with a message passed in the argument.
-   * 
-   * @param message
-   *          text message of this exception
-   */
-  public ElementInFewParentsException(String message) {
-    super(message);
-  }
-}

model/src/test/java/lcsb/mapviewer/model/map/AllMapTests.java

@@ -16,7 +16,6 @@ import lcsb.mapviewer.model.map.statistics.AllStatisticsTests;
 
 @RunWith(Suite.class)
 @SuiteClasses({ AllCompartmentTests.class,
-    ElementInFewParentsExceptionTest.class,
     AllGraphicsTests.class,
     AllKineticsTests.class,
     AllLayoutTests.class,

model/src/test/java/lcsb/mapviewer/model/map/CommentTest.java

@@ -39,7 +39,6 @@ public class CommentTest extends ModelTestFunctions {
     String name = "n";
     boolean pinned = true;
     String removeReason = "rr";
-    Model submodel = new ModelFullIndexed(null);
     Integer tableId = 5;
     Class<?> tableName = Object.class;
     User user = new User();

model/src/test/java/lcsb/mapviewer/model/map/ElementInFewParentsExceptionTest.java

-package lcsb.mapviewer.model.map;
-
-import org.apache.commons.lang3.SerializationUtils;
-import org.junit.*;
-
-import lcsb.mapviewer.ModelTestFunctions;
-
-public class ElementInFewParentsExceptionTest extends ModelTestFunctions {
-
-  @Before
-  public void setUp() throws Exception {
-  }
-
-  @After
-  public void tearDown() throws Exception {
-  }
-
-  @Test
-  public void testSerialization() {
-    SerializationUtils.serialize(new ElementInFewParentsException(""));
-  }
-
-}

model/src/test/java/lcsb/mapviewer/model/map/layout/graphics/LayerOvalTest.java

@@ -96,8 +96,6 @@ public class LayerOvalTest extends ModelTestFunctions {
     String heightParam = "72.2";
     Double height = 72.2;
 
-    String invalidNumberStr = "xxd";
-
     int id = 52;
     Color color = Color.BLACK;
 

model/src/test/java/lcsb/mapviewer/model/map/layout/graphics/LayerTextTest.java

@@ -118,8 +118,6 @@ public class LayerTextTest extends ModelTestFunctions {
     String fontSizeParam = "5.0";
     Double fontSize = 5.0;
 
-    String invalidNumberStr = "xxd";
-
     text.setY(yParam);
     assertEquals(y, text.getY(), Configuration.EPSILON);
     assertEquals(y, text.getY(), Configuration.EPSILON);