Commit graph

276 commits

Author SHA1 Message Date
rjy7
2db6b67186 Merge r1120 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-23 20:48:30 +00:00
rjy7
0b023f6f42 Merge r1114 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-23 19:58:43 +00:00
rjy7
c5031fc9a7 Merge r1110:1112 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-23 18:43:02 +00:00
rjy7
417363603d NIHVIVO-908 Create additional param in presenter role form so button text can differ from form field labels ("presenter" vs. "presentation") 2010-07-23 17:25:35 +00:00
rjy7
1cffb2bf6f Merge r1091 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-23 13:39:51 +00:00
nac26
77a4342487 merge from rel-1.1-maint branch: Add customForm.css NIHVIVO-952 2010-07-22 21:11:58 +00:00
rjy7
9fddfa3d68 Merge r1062 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 19:49:46 +00:00
rjy7
d3f9e12283 merge r1060 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 19:45:39 +00:00
rjy7
302575251f Merge r1045 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 18:50:49 +00:00
rjy7
9eebeba4f9 merge -r 905:908 -r 922 -c 946 -r 984:986 -r 1014:1029 from 1048 http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 18:44:32 +00:00
bdc34
ad3bb62b75 Merge to Trunk. Fixing last name label NIHVIVO-947 2010-07-22 18:17:41 +00:00
rjy7
2d59346f54 Merge r1035 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 17:28:54 +00:00
rjy7
7820d06255 Merge r1030 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 16:44:58 +00:00
nac26
9e6382e269 merge from rel-1.1-maint branch: changed label for type select list to "presentation type". good catch by Brian Lowe NIHVIVO-908 2010-07-22 16:02:47 +00:00
rjy7
112c2946cb Merge r1025 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 15:57:42 +00:00
rjy7
cb15494b95 Merge r1010 r1018:1023 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 15:43:18 +00:00
bdc34
eaf0a0e2d3 Merge to trunk. Changed the way a new individual is created on the siteAdmin NIHVIVO-881 2010-07-22 15:18:25 +00:00
bdc34
f8a9ffe9c5 Merge to trunk. changing forms for addRoleToPersonTwoStage.jsp so that it can edit a role with out a core:roleIn statement. NIHVIVO-863 2010-07-22 00:42:44 +00:00
bdc34
59db70e8e0 Merging to Trunk. Changing addPublicationToPerson.jsp to skip form when trying to edit an existing authorship, NIHVIVO-912 2010-07-22 00:35:24 +00:00
bdc34
012be3fdab Merge to trunk: Adding custom form that redirects to publication instead of editing. NIHVIVO-912 2010-07-21 22:16:46 +00:00
rjy7
4482d2556d Merge r970 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-21 14:27:51 +00:00
rjy7
cb14df3cf7 Merge r967 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-21 14:20:03 +00:00
bdc34
73eb40ce80 Merging from rel-1.1-maint, fixing organizationHasPostionHistory.jsp to keep track of person NIHVIVO-889 2010-07-21 14:19:04 +00:00
rjy7
48f664525b Merging r886 r905 r914:918 r923 r933:937 r957 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-20 23:36:58 +00:00
rjy7
c06384d6c2 Merging r914 through r916 from rel-1.1-maint 2010-07-19 21:35:26 +00:00
bdc34
7c4b57af9f fixing escaping in role forms NIHVIVO-835 2010-07-16 16:00:49 +00:00
rjy7
7102c770eb Changed role activity type label on presenter form for correct button text 2010-07-16 15:17:23 +00:00
rjy7
98c29ec25c a comment 2010-07-16 14:59:20 +00:00
rjy7
cef2fe12b7 Javascript fixes for roles/grants/publications forms 2010-07-16 14:57:07 +00:00
rjy7
d58b1abdc8 Add role type to "dates of participation" heading in roles form. Streamline javascript. 2010-07-16 14:44:35 +00:00
rjy7
90eabc5fdd NIHVIVO-823 Turn off autocomplete filtering on roles form, since a person can have multiple roles on the same activity. Also turn off autocomplete altogether in edit mode. 2010-07-15 17:47:36 +00:00
rjy7
d965ed0966 NIHVIVO-821 Adapt grant form for editing existing role 2010-07-15 15:58:41 +00:00
rjy7
ffbb917e40 NIHVIVO-630 Javascript modifications for modifying field label text based on type selection in roles form 2010-07-15 15:01:40 +00:00
rjy7
40125e7410 Restore autocomplete filtering to authors form (broken in r783 due to removal of id attribute) 2010-07-15 14:40:37 +00:00
rjy7
e63ad478cf NIHVIVO-629 Change return path after submitting role form when editing existing role (return to person rather than activity) 2010-07-15 14:36:07 +00:00
rjy7
7f7b302fbb NIHVIVO-797 In roles form, re-enable disabled fields on submit because they are required in the edit config. 2010-07-15 14:25:42 +00:00
rjy7
7a2d09dce6 NIHVIVO-630 Use role name instead of the individual's moniker in role short view 2010-07-15 14:02:44 +00:00
rjy7
0dbee39083 NIHVIVO-797 Change related individual label field id for clarity 2010-07-15 12:22:47 +00:00
rjy7
78fa2cf4e8 NIHVIVO-797 Javascript support for edit mode in roles forms 2010-07-15 12:14:29 +00:00
rjy7
b4cddb53e5 NIHVIVO-797 Javascript support for edit mode in roles forms 2010-07-15 12:02:36 +00:00
bdc34
236c996c3d Working on editing of existing role to custom form. NIHVIVO-629 2010-07-15 00:22:49 +00:00
bdc34
8cd7c5b6eb Working on editing of existing role to custom form. NIHVIVO-629 2010-07-15 00:07:32 +00:00
bdc34
a5ed081ecd Starting to add editing of existing role to custom form. NIHVIVO-629 2010-07-14 23:59:42 +00:00
rjy7
4094b45b87 NIHVIVO-798 Working on adding role label to roles form 2010-07-14 23:42:57 +00:00
bdc34
aa3fd0bbd1 Adding editing of existing grant NIHVIVO-629 2010-07-14 23:38:07 +00:00
bdc34
a1f7ee7715 Starting to add editing of existing role to custom form. NIHVIVO-629 2010-07-14 23:31:56 +00:00
bdc34
7cbe8b9683 Starting to add editing of existing role to custom form. NIHVIVO-629 2010-07-14 23:30:38 +00:00
bdc34
766a318bb8 Starting to add editing of existing role to custom form. NIHVIVO-629 2010-07-14 23:22:11 +00:00
rjy7
21a36706a4 NIHVIVO-799 Use LinkedHashMap in SelectListGenerator so order of HARDCODED_LITERALS select is exactly as specified. 2010-07-14 23:14:33 +00:00
bdc34
c7933369bf Adding editing of existing grant NIHVIVO-629 2010-07-14 22:50:16 +00:00