Commit graph

5246 commits

Author SHA1 Message Date
hjkhjk54
5547acc85f update for inclusion of custom form data property editing, still retaining default data property generator as default for data properties 2012-01-27 22:01:55 +00:00
hjkhjk54
2282c56aaf updates for data property editing- NIHVIVO-3386 2012-01-27 21:46:33 +00:00
stellamit
a4060f0c13 NIHVIVO-3125 (deadlock detected) 2012-01-25 21:55:04 +00:00
brianjlowe
5e7b538255 NIHVIVO-3569 added missing model lock to avoid ConcurrentModificationException when creating/retrieving a data property (merge from 1.4 maint branch) 2012-01-25 17:42:48 +00:00
j2blake
45657d6684 NIHVIVO-3542 Create a unit test for the IndividualController, before refactoring. 2012-01-24 17:23:06 +00:00
j2blake
ca46511f40 NIHVIVO-3542 Enhance the Stub classes so I can write unit tests for the IndividualController. Adjust AuthenticateTest to use the enhanced HttpServletRequestStub. 2012-01-24 17:22:34 +00:00
stellamit
191d579065 NIHVIVO-3559 Deadlock in DeltaComputer (non-invasive improvements for 1.4.1) 2012-01-23 22:55:49 +00:00
j2blake
6edf15eeaf NIHVIVO-3467 Use Solr index to speed up the auto-complete on Associated Profile in User Accounts UI. 2012-01-17 20:19:49 +00:00
j2blake
0dde805f3c NIHVIVO-3467 Refactor to use SolrQueryUtils. 2012-01-17 17:27:47 +00:00
j2blake
b09c4b309c NIHVIVO-3467 First cut at using Solr index for auto-complete on Profiles. 2012-01-16 21:44:14 +00:00
brianjlowe
343d35ec74 NIHVIVO-3537 updated 'move statements' and 'move instances' tools to write to assertions graph instead of ARQ union graph (merge from 1.4 maint branch to trunk) 2012-01-16 18:04:03 +00:00
j2blake
6bce20b84e NIHVIVO-3547 Move the "stylesheets", "scripts", and "headscripts" variables from the FreemarkerConfiguration, where they are effectively singletons, to the data model map, where they are created for each separate request. 2012-01-13 16:50:03 +00:00
tworrall
70e3bd6503 merge of 9500 from the 1.4 maintenance branch 2012-01-12 19:20:31 +00:00
j2blake
789ebe105a Merge r.9498 from maint-rel-1.4 2012-01-11 19:54:29 +00:00
tworrall
0bb104a4b2 merge from 1.4 maint, added check in case the class group name is not available 2012-01-11 17:49:40 +00:00
tworrall
9f0d886d99 these three jar files are need with the antysamy jar 2012-01-11 16:19:51 +00:00
j2blake
9bb43e9b2c NIHVIVO-3467 Restructure SparqlQueryRunner to handle both Select and Construct queries. 2012-01-10 16:42:50 +00:00
j2blake
4a917603f2 NIHVIVO-3467 Restructure SparqlQueryRunner to handle both Select and Construct queries. 2012-01-10 16:26:32 +00:00
j2blake
78ad75cc6d Improve the debugging statements. 2012-01-09 22:07:26 +00:00
j2blake
193936b80a Fix the log message. 2012-01-09 22:06:48 +00:00
manolobevia
2214336f65 NIHVIVO-3530: Removed custom forms jsp files from VITRO 2012-01-09 20:51:39 +00:00
j2blake
72a8bc9c10 NIHVIVO-3523 catch up with the trunk 2012-01-09 15:46:12 +00:00
j2blake
c2f869cc45 NIHVIVO-3523 Create HasPermissionSet identifier -- not needed, but helps in diagnostics. 2012-01-08 23:20:02 +00:00
j2blake
97a878d3c9 NIHVIVO-3523 Clean up HasRoleLevel identifier - no longer used. 2012-01-08 23:06:17 +00:00
j2blake
4ddfff7018 NIHVIVO-3523 Create the EditByRolePermission, so we can use the PermissionsPolicy instead of EditRestrictedDataByRoleLevelPolicy, and these edit restrictions can be assigned to arbitrary PermissionSets. 2012-01-06 22:39:41 +00:00
j2blake
ffafc5f3e0 NIHVIVO-3523 Create the DisplayByRolePermission, so we can use the PermissionsPolicy instead of DisplayRestrictedDataByRoleLevelPolicy, and these display restrictions can be assigned to arbitrary PermissionSets. 2012-01-06 21:58:16 +00:00
hjkhjk54
30855a60a5 NIHVIVO-3357- updating per Brian Lowe's instructions, commenting out portion that would add all subclasses of owl:Thing in case property has no range. 2012-01-06 17:38:50 +00:00
j2blake
213055b65f Tweak the description of vitro.ocal.solr.ipaddress.mask 2011-12-31 16:32:44 +00:00
j2blake
9d74b4e41a NIHVIVO-3523 Protect against null arguments. 2011-12-23 19:29:45 +00:00
j2blake
a75b15d940 NIHVIVO-3523 Handle multiple roles properly when creating or editing user accounts. For a new account, suggest the default roles. Still using only one role, because we have radio buttons instead of checkboxes. 2011-12-23 19:24:51 +00:00
j2blake
c18e14a106 Fix UserAccounts list page so it encodes the role URIs properly when filtering. Only show non-public roles for selections. 2011-12-23 17:38:31 +00:00
j2blake
5051c56f7a NIHVIVO-3523 Break up the CommonIdentifierBundleFactory into several pieces: one for each type of Identifier. Add some unit tests. 2011-12-23 17:33:48 +00:00
j2blake
f63722a2fe NIHVIVO-3523 The IsRootUser identifier takes no parameters, so make it a singleton. 2011-12-23 16:49:19 +00:00
j2blake
5ca2848946 NIHVIVO-3523 Override equals() and hashCode() to make these Identifiers more flexible and more testable. 2011-12-23 16:48:46 +00:00
j2blake
59f3cb6311 NIHVIVO-3523 Add convenience constructors to ArrayIdentifierBundle 2011-12-22 19:59:12 +00:00
j2blake
9d55acb2f3 NIHVIVO-3523 Re-write Permission as an abstract class rather than an interface. Make it Comparable. Remove the unused methods for getLocalName() and getNamespace() 2011-12-22 19:39:23 +00:00
j2blake
45e8d0c654 NIHVIVO-3523 Convert all simple PUBLIC-or-above requested actions to SimplePermissions. 2011-12-22 15:33:48 +00:00
j2blake
e5894ee80a NIHVIVO-3523 Add the concept of a PermissionSetForPublic (and rename PermissionSetForNewUsers) 2011-12-22 15:33:18 +00:00
j2blake
779c48c683 NIHVIVO-3523 Improve the layout of admin/showAuth 2011-12-22 15:32:12 +00:00
j2blake
94a2d9327c NIHVIVO-3523 Oops. Some of the JSPs were using those RequestedAction classes that I converted to SimplePermissions. 2011-12-21 23:02:31 +00:00
j2blake
8ba596bfae NIHVIVO-3523 Convert all simple SELF_EDITOR-or-above requested actions to SimplePermissions. 2011-12-21 22:08:33 +00:00
j2blake
b36659d9f4 NIHVIVO-3523 Convert all simple EDITOR-or-above requested actions to SimplePermissions. 2011-12-21 21:41:13 +00:00
j2blake
1aac179c87 NIHVIVO-3523 Convert all simple CURATOR-or-above requested actions to SimplePermissions. 2011-12-21 21:23:04 +00:00
j2blake
adad173dc9 NIHVIVO-3523 Convert all simple ADMIN-only requested actions to SimplePermissions. 2011-12-21 20:46:17 +00:00
j2blake
a5495f36b4 NIHVIVO-3523 Create the PermissionsPolicy. 2011-12-20 22:13:58 +00:00
j2blake
df0da56e7b NIHVIVO-3523 Create the HasPermission identifier. 2011-12-20 22:00:48 +00:00
j2blake
24e1c7cfd8 NIHVIVO-3523 Set up an empty PermissionRegistry for the unit test. 2011-12-20 21:54:09 +00:00
j2blake
e72cd6a78b NIHVIVO-3523 Implement more functionality for unit tests. 2011-12-20 21:53:27 +00:00
j2blake
20b7f694d1 NIHVIVO-3523 Write the PermissionSetsLoader. 2011-12-20 21:24:52 +00:00
j2blake
a9c7b3fead NIHVIVO-3523 Add DefaultPermissionSetForNewUsers to the User Accounts Model, with a property in PermissionSet and a test in UserAccountsDaoJenaTest. 2011-12-19 23:10:30 +00:00