Commit f3745a53 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

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

Resolve "Users sorting by name not available"

Closes #808

See merge request !864
parents 6f5419ce e3d90d54
Pipeline #12566 passed with stage
in 13 minutes and 11 seconds
...@@ -25,6 +25,7 @@ minerva (14.0.0~alpha.0) unstable; urgency=low ...@@ -25,6 +25,7 @@ minerva (14.0.0~alpha.0) unstable; urgency=low
* Small improvement: information about deprecated columns in data overlay is * Small improvement: information about deprecated columns in data overlay is
visible in overlay list (#838) visible in overlay list (#838)
* Small improvement: publication list is resizable (#740) * 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 * Bug fix: export to CellDesigner of reaction with two modifiers connected
with boolean operator resulted was skipping some layout information with boolean operator resulted was skipping some layout information
* Bug fix: reaction in SBGNML file containing two products was improperly * Bug fix: reaction in SBGNML file containing two products was improperly
......
...@@ -620,7 +620,8 @@ EditProjectDialog.prototype.createUserPrivilegeColumns = function () { ...@@ -620,7 +620,8 @@ EditProjectDialog.prototype.createUserPrivilegeColumns = function () {
var configuration = self.getConfiguration(); var configuration = self.getConfiguration();
self._userPrivilegeColumns = [{ self._userPrivilegeColumns = [{
title: "Name" title: "Name",
orderable: true
}]; }];
var privilegeTypes = configuration.getPrivilegeTypes(); var privilegeTypes = configuration.getPrivilegeTypes();
for (var i = 0; i < privilegeTypes.length; i++) { for (var i = 0; i < privilegeTypes.length; i++) {
...@@ -628,7 +629,8 @@ EditProjectDialog.prototype.createUserPrivilegeColumns = function () { ...@@ -628,7 +629,8 @@ EditProjectDialog.prototype.createUserPrivilegeColumns = function () {
if (type.getObjectType() === "Project") { if (type.getObjectType() === "Project") {
self._userPrivilegeColumns.push({ self._userPrivilegeColumns.push({
"title": type.getCommonName(), "title": type.getCommonName(),
privilegeType: type privilegeType: type,
orderable: false
}); });
} }
} }
...@@ -739,7 +741,7 @@ EditProjectDialog.prototype.initUsersTab = function () { ...@@ -739,7 +741,7 @@ EditProjectDialog.prototype.initUsersTab = function () {
var columns = self.createUserPrivilegeColumns(); var columns = self.createUserPrivilegeColumns();
$(usersTable).DataTable({ $(usersTable).DataTable({
columns: columns, columns: columns,
ordering: false ordering: true
}); });
return Promise.resolve(); return Promise.resolve();
}; };
......
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);
}
}
...@@ -16,7 +16,6 @@ import lcsb.mapviewer.model.map.statistics.AllStatisticsTests; ...@@ -16,7 +16,6 @@ import lcsb.mapviewer.model.map.statistics.AllStatisticsTests;
@RunWith(Suite.class) @RunWith(Suite.class)
@SuiteClasses({ AllCompartmentTests.class, @SuiteClasses({ AllCompartmentTests.class,
ElementInFewParentsExceptionTest.class,
AllGraphicsTests.class, AllGraphicsTests.class,
AllKineticsTests.class, AllKineticsTests.class,
AllLayoutTests.class, AllLayoutTests.class,
......
...@@ -39,7 +39,6 @@ public class CommentTest extends ModelTestFunctions { ...@@ -39,7 +39,6 @@ public class CommentTest extends ModelTestFunctions {
String name = "n"; String name = "n";
boolean pinned = true; boolean pinned = true;
String removeReason = "rr"; String removeReason = "rr";
Model submodel = new ModelFullIndexed(null);
Integer tableId = 5; Integer tableId = 5;
Class<?> tableName = Object.class; Class<?> tableName = Object.class;
User user = new User(); User user = new User();
......
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(""));
}
}
...@@ -96,8 +96,6 @@ public class LayerOvalTest extends ModelTestFunctions { ...@@ -96,8 +96,6 @@ public class LayerOvalTest extends ModelTestFunctions {
String heightParam = "72.2"; String heightParam = "72.2";
Double height = 72.2; Double height = 72.2;
String invalidNumberStr = "xxd";
int id = 52; int id = 52;
Color color = Color.BLACK; Color color = Color.BLACK;
......
...@@ -118,8 +118,6 @@ public class LayerTextTest extends ModelTestFunctions { ...@@ -118,8 +118,6 @@ public class LayerTextTest extends ModelTestFunctions {
String fontSizeParam = "5.0"; String fontSizeParam = "5.0";
Double fontSize = 5.0; Double fontSize = 5.0;
String invalidNumberStr = "xxd";
text.setY(yParam); text.setY(yParam);
assertEquals(y, text.getY(), Configuration.EPSILON); assertEquals(y, text.getY(), Configuration.EPSILON);
assertEquals(y, text.getY(), Configuration.EPSILON); assertEquals(y, text.getY(), Configuration.EPSILON);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment