litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4307 commits 9 branches 0 tags 258 MiB
Commit graph

2458 commits

Author SHA1 Message Date
jeb228
8676ec5544 NIHVIVO-151 Get better control of redirection after logging in. 
1) The login link goes to the controller, not directly to the form.
2) The process bean holds the URL where the form is located, and the URL we will go to on success.
3) Only the controller alters the state of the bean, not the widget.
4) The process bean is kept until the redirector can get information from it.
5) Finally, with more control in the redirector, change the behavior.
 2010-12-08 22:14:39 +00:00
rjy7
ba3163da20 Fix redirect from /individual to /display in IndividualController 2010-12-08 22:00:09 +00:00
yuysun
1ac4d34057 2010-12-08 19:06:20 +00:00
rjy7
38fef41a12 Moved utility methods for parsing query results back to PageDaoJena from JenaBaseDao, because they are not all-purpose at this point. 2010-12-08 17:10:37 +00:00
rjy7
cc9f132503 Removed request attribute freemarkerComponentsDone: no longer needed, since the call to the component generator has been centralized. 2010-12-08 14:22:02 +00:00
nac26
9892846244 NIHVIVO-1389 NIHVIVO-1407 NIHVIVO-1437 Significant refactoring of templates both in vitro core and vivo themes to ensure consistent markup with 3 different base templates at play (page.ftl, basicPage.jsp and formPrefix/formSuffix.jsp) Resulted in creating smaller component freemarker templates that could be included by all of the base templates, whether ftl or jsp. This is a temporary compromise while we continue our conversion to Freemarker. The goal was to keep jsp files outside of the theme and working behind the scenes. 2010-12-08 14:05:16 +00:00
ass92
1126d6f75d reverting it back to original piece of code as Nick faced some problem. Will look into whats the problem. 2010-12-08 13:59:40 +00:00
ass92
c332d76577 NIHVIVO-1226 made a change so that the sparql query goes through Dataset. 2010-12-07 22:06:06 +00:00
rjy7
e4d301cf98 NIHVIVO-1333 Continued work on display of object properties on individual profile, including getting sparql query and template name from a config file and using it to generate and display statements. 2010-12-07 21:30:13 +00:00
jeb228
1bad0658cb NIHVIVO-1393 for the external login button, put the entire text in the deploy.properties value. 2010-12-07 18:41:02 +00:00
ass92
6e7afb976d Sparql query improvments. 2010-12-07 17:48:05 +00:00
ass92
c67ed3921c NIHVIVO-1451 mechanism to toggle between VitroJenaModelMaker and VitroSDBModelMaker in ingest tools. 2010-12-07 17:15:56 +00:00
ass92
6066180a6c NIHVIVO-1449 add methods to JenaDataSourceSetupBase and remove VitroJenaModelMakerSetup listener 2010-12-07 16:59:58 +00:00
rjy7
54395c6cb3 NIHVIVO-1333 Continued work on ontology property display 2010-12-07 14:29:17 +00:00
rjy7
cb230a10c3 NIHVIVO-1333 Make ObjectPropertyTemplateModel a non-abstract class to represent uncollated object properties, so UncollatedObjectPropertyTemplateModel is not needed. Some test code in the template to distinguish collated and uncollated object properties. 2010-12-06 22:55:17 +00:00
rjy7
5b0a4eb03c NIHVIVO-1333 Output property names within each property group 2010-12-06 21:40:53 +00:00
rjy7
f9a02c5218 NIHVIVO-1394 Provide a currentPage variable to the page template. 2010-12-06 21:40:23 +00:00
bjl23
7149091c75 improvements to model listener registration 2010-12-06 20:47:38 +00:00
jeb228
53de388998 NIHVIVO-1232 Create InformationResourceEditingPolicySetup, add to web.xml, and modify EditProhibitionListener to keep it current. 2010-12-06 19:57:32 +00:00
jeb228
6a79bca59f NIHVIVO-1232 Create InformationResourceEditingPolicy, with tests. 2010-12-06 19:56:45 +00:00
jeb228
373538c868 NIHVIVO-1232 Create a base class so methods can be shared between SelfEditingPolicy and InformationResourceEditingPolicy 2010-12-06 19:53:16 +00:00
bdc34
cae6670937 Adding tabMenu and menu to FreemarkerHttpServlet so tabs and the new menus can coexist. NIHVIVO-632 2010-12-06 17:56:45 +00:00
rjy7
bfd81d1327 NIHVIVO-1333 Continued work on ontology property display on individual profile page. 2010-12-06 16:47:41 +00:00
bdc34
7831351b94 Working on tomcat filter for menu page URL routing NIHVIVO-1383 2010-12-03 22:37:02 +00:00
rjy7
e398bdd79a NIHVIVO-1476 Made ResponseValues and implementing classes public, and moved to their own package, for use by classes not in the freemarker package and not subclassing FreemarkerHttpServlet. 2010-12-03 20:36:22 +00:00
rjy7
f6ff54120d NIHVIVO-1333 Handle property group for unassigned properties, and case where no property groups are defined 2010-12-03 17:30:18 +00:00
rjy7
61bc9486fb NIHVIVO-1333 Removed template model wrapper objects in construction of grouped property list 2010-12-02 23:05:53 +00:00
bdc34
3180ed432b Adding menu controller, tomcat filter for menu page URL routing NIHVIVO-1073 NIHVIVO-597 2010-12-02 21:09:58 +00:00
rjy7
90c710400b NIHVIVO-1333 Revert changes from r6573, and move namespace filtering on properties into the sparql query 2010-12-02 20:48:53 +00:00
jeb228
fb855abaf1 NIHVIVO-1232 Refactor to remove duplicated code and to avoid the Visitor pattern. 2010-12-02 19:50:02 +00:00
jeb228
d27c258ad5 NIHVIVO-1232 Pull the code that covers restricted Namespaces and URIs into its own class. 2010-12-02 19:11:13 +00:00
rjy7
5cc801ee2c NIHVIVO-1333 Moved dao methods for constructing lists of data properties and object properties for an individual into their own dao classes 2010-12-02 18:57:58 +00:00
jeb228
2fe2a52256 NIHVIVO-1232 Give the resource actions a common ancestor. Clean them up. Make them immutable objects. 2010-12-02 18:31:51 +00:00
jeb228
9279dd1b4c NIHVIVO-1232 Move the resource related actions into a new requestedAction.resource package 2010-12-02 18:13:34 +00:00
jeb228
043f2f1a3d NIHVIVO-1232 Give the data property statement actions a common ancestor. Clean them up. Make them immutable objects. 2010-12-02 18:05:02 +00:00
jeb228
1e099fd488 NIHVIVO-1232 Give the object property statement actions a common ancestor. Make them immutable objects. 2010-12-02 17:35:56 +00:00
jeb228
b1fe45f9ff NIHVIVO-1232 Move the property statement actions into a new requestedAction.propstmt package 2010-12-02 17:07:04 +00:00
jeb228
1e0230777e NIHVIVO-1232 refactor SelfEditorPolicy and fix the handling of multiple SelfEditor identifiers. Add tests. 2010-12-02 15:45:20 +00:00
rjy7
10dc4d3e1f NIHVIVO-1333 Lots of work on display of ontology properties on individual page (nothing visible yet). 2010-12-01 22:28:54 +00:00
bjl23
0711f006f0 quick change to jenaOntModel attribute value in SDB to use TBox+ABox union - will change more later 2010-12-01 21:32:04 +00:00
jeb228
a645c60e13 NIHVIVO-1368 fill the loginName field with a previously-supplied value, if one exists. 2010-12-01 15:39:16 +00:00
jeb228
49ff09b9d4 NIHVIVO-1430 Fix the Login redirector and associated classes to recognize 2 types of association: by SelfEditingConfig and by MayEditAs 2010-11-30 22:45:31 +00:00
jeb228
ecd8e7bebd Include the explanation of file names and directories, cribbed from vivo-dev-all list. 2010-11-30 15:01:04 +00:00
rjy7
42dca90027 NIHVIVO-1333 More work on property display on individual page 2010-11-30 13:45:28 +00:00
jeb228
30fa59cf5e NIHVIVO-1379 If a user is logged in but not authorized to view a page, send them to a page with an explanation. 2010-11-29 22:36:19 +00:00
jeb228
ec2c390152 NIHVIVO-1379 Give this page a more appropriate restriction level. 2010-11-29 22:34:57 +00:00
jeb228
edac38e007 NIHVIVO-151 record the URIs of restricted pages. On logout, don't send the user back to a restricted page. 2010-11-29 21:37:42 +00:00
jeb228
d60f39f7d4 NIHVIVO-151 send all logout requests directly to /logout. Remove old links to login_process.jsp 2010-11-29 21:37:01 +00:00
jeb228
5d4625d421 NIHVIVO-1430 When a user logs in, change what is viewed. Consolidate the logic so an external user is more like an internal user. 2010-11-29 20:08:34 +00:00
bjl23
0740e57749 fixes some graph variables in DAO SPARQL queries 2010-11-29 19:59:32 +00:00