Commit graph

2900 commits

Author SHA1 Message Date
ryounes
25ddcac07a Fix comments (mostly alignments) 2011-07-25 15:52:51 +00:00
ryounes
17c935f666 Merge r8822 from maint-rel-vivo-1.3 2011-07-25 15:04:14 +00:00
briancaruso
47d8742503 checking for null RequestDispatcher in PageRoutingFitler 2011-07-25 14:54:03 +00:00
ryounes
b03c4399c6 Merge r8819 from maint-rel-vivo-1.3 2011-07-25 14:20:52 +00:00
stellamit
3a853c54f8 merging NIHVIVO-3028 from branch 2011-07-23 03:06:03 +00:00
briancaruso
199a5f6c2f merging 8813 8810 8803 8802 8741 8731 2011-07-22 23:20:13 +00:00
ryounes
ee42cad576 NIHVIVO-3042 Remove property group rank comparison from GroupedPropertyList.PropertyRanker 2011-07-22 21:06:29 +00:00
stellamit
283ab767d9 merging from branch 2011-07-22 20:51:28 +00:00
brianjlowe
f46e4b46f0 NIHVIVO-3036 fixed lockup of system when adding superclass of class with many individuals 2011-07-22 19:58:53 +00:00
hjkhjk54
4fa16f31ac Updates for both NIHVIVO-3039 and NIHVIVO-3038 2011-07-22 19:53:18 +00:00
brianjlowe
1713933e93 NIHVIVO-3029 fixes deletion of class groups and property groups, and fixes excessive locking during VClassGroupCache rebuild 2011-07-22 18:05:43 +00:00
ryounes
e4233c003b NIHVIVO-3020 Refactor code that puts properties into groups to loop through properties first, rather than groups, so that properties assigned to non-existent groups get assigned to "other" group rather than being dropped. Also makes more sense this way and avoids unnecessary repetitions. Remove group-level sorting because this is done for the property list as a whole. 2011-07-22 16:53:06 +00:00
deepakkoni
adba60a9de NIHVIVO-2979 Committing functionality to the trunk. 2011-07-22 16:52:48 +00:00
deepakkoni
96e65e96c3 2011-07-22 16:34:20 +00:00
hjkhjk54
154a3b80ad Including default namespace to be sent back to template NIHVIVO-3022 2011-07-21 18:41:02 +00:00
ryounes
b73939fc80 NIHVIVO-1512 ReadOnlyBeansWrapper - draft implementation, not yet functioning as desired. Remove a deprecated method. 2011-07-21 16:04:23 +00:00
hjkhjk54
6833284706 Updating logging for NIHVIVO-3015 and NIHVIVO-2999 2011-07-21 15:16:24 +00:00
cappadona
fd945e97ad NIHVIVO-1481 Merged r8774 from maint-rel-vivo-1.3 branch. 2011-07-21 12:33:41 +00:00
ryounes
e664b8bf62 NIHVIVO-2974 Allow for vivo-specific extensions to SiteAdminController. Move vivo-specific links to this extension. 2011-07-20 19:31:18 +00:00
ryounes
d3fb0d8f50 Merge r8739, r8744 from maint-rel-vivo-1.3 branch 2011-07-20 19:25:54 +00:00
hjkhjk54
5170a1476b Updating individuals for classes data getter to sort class list for display 2011-07-20 18:40:59 +00:00
j2blake
5de98569bf Merge r8729, r8746 from the release 1.3 maintenance branch 2011-07-20 16:06:19 +00:00
briancaruso
5ff4bc5d6d Merging from 1.3 maint branch. 2011-07-20 15:42:26 +00:00
ryounes
54b8d9ab2c Merge r8732 from maint-rel-vivo-1.3 2011-07-19 23:07:18 +00:00
deepakkoni
6ba5a566e4 NIHVIVO-2970 - removing the changes added to context node queries since that is reducing the recall in search results. 2011-07-18 22:32:21 +00:00
ryounes
f1795ab50a Fix indenting 2011-07-18 21:48:37 +00:00
deepakkoni
14e1ef9d79 Filtering out the individual's labels from context node queries. 2011-07-18 21:46:18 +00:00
hjkhjk54
504037488f changed some log.info statements back to debug 2011-07-18 21:15:51 +00:00
deepakkoni
1d5f5e4edb NIHVIVO-2970 - 1) 1. Local names of context nodes appearing in snippet (result 1) -- should be resolved with this fix. 2011-07-18 21:09:56 +00:00
hjkhjk54
24bba51a47 Ensuring name of class shows correctly on internal class page 2011-07-18 20:27:28 +00:00
hjkhjk54
1d9e1fb2ae Updating class counts for internal class menu pages (so counts retrieved based on what you see on page). Also reverted some log info statements in json servlet back to debug level. 2011-07-18 20:16:28 +00:00
ryounes
1674c103a8 Minor tweak to getSnippets() method of PagedSearchController 2011-07-18 19:21:57 +00:00
brianjlowe
ffad7bf702 NIHVIVO-2958 fixed bug in retrieving class example annotations 2011-07-18 19:09:53 +00:00
j2blake
cf13f22f36 Remove an unused filter, and several unused or empty unit test classes, with data files. 2011-07-18 18:57:55 +00:00
brianjlowe
fbf484b537 NIHVIVO-2964 unfiltered dao method on VitroRequest 2011-07-18 17:48:14 +00:00
hjkhjk54
2fb3cc200f Additional info/debugging statements 2011-07-18 17:37:42 +00:00
ryounes
ca15e31d62 Move getSelfEditingId() from vivo-specific IndividualTemplateModel to BaseIndividualTemplateModel, since the property is defined and managed at the vitro level 2011-07-18 17:06:29 +00:00
briancaruso
1f39e6a96d Refactored SearchReindexingListener so additionalUriFinders is run async in model listener methods. NIHVIVO-2951 2011-07-18 16:27:11 +00:00
cappadona
8095541706 NIHVIVO-352 Applied Miles' patch for search snippets. 2011-07-18 16:26:53 +00:00
hjkhjk54
d434376bdc updates for debugging and NIHVIVO-2956 2011-07-18 16:12:43 +00:00
brianjlowe
df5d11e60d NIHVIVO-2959 improvement to data property statement retrieval by property for individuals 2011-07-18 16:08:57 +00:00
hjkhjk54
a7535038f2 updated internal class query to return classes for page when there is no internal class selected 2011-07-18 14:00:07 +00:00
stellamit
9bf0ebafa8 NIHVIVO-2952 abox recompute synchronously on a fresh DB and asynchronously otherwise. 2011-07-17 21:44:01 +00:00
j2blake
bbe47f84d8 NIHVIVO-2476 Modify IndividualFiltering.getPopulatedObjectPropertyList() to filter on statements that include the Individual as well as the Property. Disable the failing unit tests until they can be re-written. 2011-07-17 16:38:15 +00:00
j2blake
12e6af44f5 Clarify login in fillDataPropertiesForIndividual by using generic-types on collections, and converting to new-style for loops. 2011-07-17 13:59:53 +00:00
j2blake
a949d99bb5 NIHVIVO-2476 Modify IndividualFiltering.getPopulatedDataPropertyList() to filter on statements that include the Individual as well as the Property. Disable the failing unit tests until they can be re-written. 2011-07-16 21:22:39 +00:00
ryounes
7c51af4a38 NIHVIVO-2886, NIHVIVO-2940 Refactoring for clarity of admin link generation 2011-07-15 21:50:50 +00:00
ryounes
64f930f053 NIHVIVO-2886, NIHVIVO-2940 Fix display of links based on policy checks 2011-07-15 21:38:59 +00:00
briancaruso
902d15287d Classgroup cache clearing prohibited unless authorized. NIHVIVO-2942 2011-07-15 20:57:15 +00:00
ryounes
593266b512 Use LinkedHashMap in getMostSpecificTypes method so order is preserved when we get the values in JsonServlet 2011-07-15 20:49:03 +00:00