From 057f1279cd905e41387497704c721be4a8d562ab Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Fri, 30 Sep 2011 17:44:12 +0100 Subject: [PATCH] Various cleanups --- .../decorators/includes/navigation-browse.ftl | 92 ++-- .../decorators/includes/navigation-my.ftl | 90 ++-- .../src/main/webapp/error/internal.ftl | 17 +- .../includes/components/contact-info.ftl | 20 +- .../webapp/pages/admin/authorize-advanced.ftl | 157 +++--- .../pages/admin/authorize-collection-edit.ftl | 114 ++-- .../pages/admin/authorize-community-edit.ftl | 124 +++-- .../pages/admin/authorize-item-edit.ftl | 408 +++++++-------- .../webapp/pages/admin/authorize-main.ftl | 86 ++- .../pages/admin/authorize-policy-edit.ftl | 136 +++-- .../webapp/pages/admin/collection-select.ftl | 71 ++- .../webapp/pages/admin/community-select.ftl | 71 ++- .../webapp/pages/admin/edit-item-form.ftl | 491 ++++++++---------- .../main/webapp/pages/admin/item-metadata.ftl | 1 - .../src/main/webapp/pages/item.ftl | 2 +- .../webapp/pages/register/profile-form.ftl | 75 ++- .../controller/BrowseHierarchyController.java | 5 +- .../webmvc/controller/HandleController.java | 2 +- .../webmvc/controller/RegisterController.java | 179 ++----- .../controller/admin/ItemController.java | 29 +- 20 files changed, 953 insertions(+), 1217 deletions(-) diff --git a/freemarkerui-webapp/src/main/webapp/decorators/includes/navigation-browse.ftl b/freemarkerui-webapp/src/main/webapp/decorators/includes/navigation-browse.ftl index 216b603..6e3609d 100644 --- a/freemarkerui-webapp/src/main/webapp/decorators/includes/navigation-browse.ftl +++ b/freemarkerui-webapp/src/main/webapp/decorators/includes/navigation-browse.ftl @@ -1,47 +1,47 @@ -<#-- - $Id: $ - $URL: $ - ************************************************************************* - Copyright (c) 2002-2009, DuraSpace. All rights reserved - Licensed under the DuraSpace License. - - A copy of the DuraSpace License has been included in this - distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt ---> -<#-- Browse for sidebar --> -
-

<@dspace.message "ui.navigation.browse.header" />

- +<#-- + $Id: $ + $URL: $ + ************************************************************************* + Copyright (c) 2002-2009, DuraSpace. All rights reserved + Licensed under the DuraSpace License. + + A copy of the DuraSpace License has been included in this + distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt +--> +<#-- Browse for sidebar --> +
+

<@dspace.message "ui.navigation.browse.header" />

+
\ No newline at end of file diff --git a/freemarkerui-webapp/src/main/webapp/decorators/includes/navigation-my.ftl b/freemarkerui-webapp/src/main/webapp/decorators/includes/navigation-my.ftl index 03119a5..8562785 100644 --- a/freemarkerui-webapp/src/main/webapp/decorators/includes/navigation-my.ftl +++ b/freemarkerui-webapp/src/main/webapp/decorators/includes/navigation-my.ftl @@ -1,46 +1,46 @@ -<#-- - $Id: $ - $URL: $ - ************************************************************************* - Copyright (c) 2002-2009, DuraSpace. All rights reserved - Licensed under the DuraSpace License. - - A copy of the DuraSpace License has been included in this - distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt ---> -<#-- My Account box for sidebar --> -
-

<@dspace.message "ui.navigation.my.account" />

- +<#-- + $Id: $ + $URL: $ + ************************************************************************* + Copyright (c) 2002-2009, DuraSpace. All rights reserved + Licensed under the DuraSpace License. + + A copy of the DuraSpace License has been included in this + distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt +--> +<#-- My Account box for sidebar --> +
+

<@dspace.message "ui.navigation.my.account" />

+
\ No newline at end of file diff --git a/freemarkerui-webapp/src/main/webapp/error/internal.ftl b/freemarkerui-webapp/src/main/webapp/error/internal.ftl index 8e25cf0..c1cffa5 100644 --- a/freemarkerui-webapp/src/main/webapp/error/internal.ftl +++ b/freemarkerui-webapp/src/main/webapp/error/internal.ftl @@ -1,10 +1,7 @@ -<#import "/includes/dspace.ftl" as dspace /> - -

<@dspace.message "ui.error.internal.title" />

- -

<@dspace.message "ui.error.internal.text1" />

- - <#include "/includes/components/contact-info.ftl" /> - -

"><@dspace.message "ui.general.gohome" />

- +<#import "/includes/dspace.ftl" as dspace /> + +

<@dspace.message "ui.error.internal.title" />

+

<@dspace.message "ui.error.internal.text1" />

+<#include "/includes/components/contact-info.ftl" /> +

"><@dspace.message "ui.general.gohome" />

+ diff --git a/freemarkerui-webapp/src/main/webapp/includes/components/contact-info.ftl b/freemarkerui-webapp/src/main/webapp/includes/components/contact-info.ftl index 6cbf356..20d248f 100644 --- a/freemarkerui-webapp/src/main/webapp/includes/components/contact-info.ftl +++ b/freemarkerui-webapp/src/main/webapp/includes/components/contact-info.ftl @@ -1,10 +1,10 @@ -<#import "/includes/dspace.ftl" as dspace /> - - -

"> - <#if dspacename??> - <#assign showingArgs = [dspacename]> -

<@dspace.messageArgs "ui.components.contact-info.details", showingArgs/>

-

- - +<#import "/includes/dspace.ftl" as dspace /> + +

"> + <#if dspacename??> + <#assign showingArgs = [dspacename]> +

<@dspace.messageArgs "ui.components.contact-info.details", showingArgs/>

+ +

+ + diff --git a/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-advanced.ftl b/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-advanced.ftl index 88734d4..869ee27 100644 --- a/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-advanced.ftl +++ b/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-advanced.ftl @@ -1,84 +1,75 @@ -<#import "/includes/dspace.ftl" as dspace /> - - - -

<@dspace.message "ui.dspace-admin.authorize-advanced.advanced" />

- -
<@dspace.message "ui.dspace-admin.authorize-advanced.text" />" onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.morehelp" />
- -
"> - - - - <%-- --%> - - - - - - <%-- --%> - - - - - - <%-- --%> - - - - - - <%-- --%> - - - -
Collection: - -
Content Type: - -
Group:<@dspace.message "ui.dspace-admin.general.group-colon" /> - -
Action: - -
- -
- - - - - - -
- <%-- --%> - " /> - - <%-- (warning: clears all policies for a given set of objects) --%> - "/> <@dspace.message "ui.dspace-admin.authorize-advanced.warning" /> -
- -
+<#import "/includes/dspace.ftl" as dspace /> + + + +

<@dspace.message "ui.dspace-admin.authorize-advanced.advanced" />

+
+ <@dspace.message "ui.dspace-admin.authorize-advanced.text" /> + " onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.morehelp" /> +
+"> + + + + + + + + + + + + + + + + + +
+ +
+ +
<@dspace.message "ui.dspace-admin.general.group-colon" /> + +
+ +
+
+ + + + + + +
+ " /> + + "/> + + <@dspace.message "ui.dspace-admin.authorize-advanced.warning" /> +
+
\ No newline at end of file diff --git a/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-collection-edit.ftl b/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-collection-edit.ftl index bf8082e..353393b 100644 --- a/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-collection-edit.ftl +++ b/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-collection-edit.ftl @@ -1,60 +1,54 @@ -<#import "/includes/dspace.ftl" as dspace /> - - - - - - -
- <#if collection??><#assign showingArgs=[collection.getMetadata("name"), collection.getHandle(), collection.getID()]> -

<@dspace.messageArgs "ui.dspace-admin.authorize-collection-edit.policies", showingArgs />

- 		- " onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.help" /> -
- -
" method="post"> -

- - " /> -

-
- -<#assign row = "even"> -<#if policies??> - <#list policies as rp> -
" method="post"> - - - - - - - - - - - - - - - - -
<@dspace.message "ui.general.id" /><@dspace.message "ui.dspace-admin.general.action" /><@dspace.message "ui.dspace-admin.general.group" />  
${rp.getID()} - ${rp.getActionText()} - - <#if rp.getGroup()??>${rp.getGroup().getName()}<#else>${"..."} - - - - " /> - - " /> -
-
- <#if row == "even"> - <#assign row = "odd"> - <#else> - <#assign row = "even"> - - - \ No newline at end of file +<#import "/includes/dspace.ftl" as dspace /> + + + + + +
+ <#if collection??> + <#assign showingArgs=[collection.getMetadata("name"), collection.getHandle(), collection.getID()]> +

<@dspace.messageArgs "ui.dspace-admin.authorize-collection-edit.policies", showingArgs />

+ + 		+ " onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.help" /> +
+
" method="post"> +

+ + " /> +

+
+<#assign row = "even"> +<#if policies??> + <#list policies as rp> +
" method="post"> + + + + + + + + + + + + + + + +
<@dspace.message "ui.general.id" /><@dspace.message "ui.dspace-admin.general.action" /><@dspace.message "ui.dspace-admin.general.group" />  
${rp.getID()}${rp.getActionText()}<#if rp.getGroup()??>${rp.getGroup().getName()}<#else>${"..."} + + + " /> + + " /> +
+
+ <#if row == "even"> + <#assign row = "odd"> + <#else> + <#assign row = "even"> + + + diff --git a/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-community-edit.ftl b/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-community-edit.ftl index 676c30c..2ee2621 100644 --- a/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-community-edit.ftl +++ b/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-community-edit.ftl @@ -1,63 +1,61 @@ -<#import "/includes/dspace.ftl" as dspace /> - - - - - - -
- <#if community??><#assign showingArgs=[community.getMetadata("name"), community.getHandle(), community.getID()]> -

<@dspace.messageArgs "ui.dspace-admin.authorize-community-edit.policies", showingArgs />

- 		- " onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.help" /> -
- -
" method="post"> -

- - " /> -

-
- - - - - - - - - - - - <#assign row = "even"> - <#if policies??> - <#list policies as rp> - - - - - - - - <#if row == "even"> - <#assign row = "odd"> - <#else> - <#assign row = "even"> - - - -
<@dspace.message "ui.general.id" /><@dspace.message "ui.dspace-admin.general.action" /><@dspace.message "ui.dspace-admin.general.group" />  
${rp.getID()} - ${rp.getActionText()} - <#if rp.getGroup()??>${rp.getGroup().getName()}<#else>${"..."} -
" method="post"> - - - " /> -
- 		-
" method="post"> - - - " /> -
-
\ No newline at end of file +<#import "/includes/dspace.ftl" as dspace /> + + + + + + +
+ <#if community??> + <#assign showingArgs=[community.getMetadata("name"), community.getHandle(), community.getID()]> +

<@dspace.messageArgs "ui.dspace-admin.authorize-community-edit.policies", showingArgs />

+ + 		+ " onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.help" /> +
+ +
" method="post"> +

+ + " /> +

+
+ + + + + + + + + + <#assign row = "even"> + <#if policies??> + <#list policies as rp> + + + + + + + + <#if row == "even"> + <#assign row = "odd"> + <#else> + <#assign row = "even"> + + + +
<@dspace.message "ui.general.id" /><@dspace.message "ui.dspace-admin.general.action" /><@dspace.message "ui.dspace-admin.general.group" />  
${rp.getID()}${rp.getActionText()}<#if rp.getGroup()??>${rp.getGroup().getName()}<#else>${"..."} +
" method="post"> + + + " /> +
+ 		+
" method="post"> + + + " /> +
+
diff --git a/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-item-edit.ftl b/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-item-edit.ftl index 8835dcb..9234025 100644 --- a/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-item-edit.ftl +++ b/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-item-edit.ftl @@ -1,219 +1,189 @@ -<#import "/includes/dspace.ftl" as dspace /> - - - - - - - - -
- <#if item??> - <#if item.getHandle()??> - <#assign showingArgs=[item.getHandle(), item.getID()]> - <#else> - <#assign showingArgs=["null", item.getID()]> - -

<@dspace.messageArgs "ui.dspace-admin.authorize-item-edit.policies", showingArgs />

- 		- " onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.help" /> -
- -

<@dspace.message "ui.dspace-admin.authorize-item-edit.text1" />

-

<@dspace.message "ui.dspace-admin.authorize-item-edit.text2" />

- -

<@dspace.message "ui.dspace-admin.authorize-item-edit.item" />

- -
"> -

- - " /> -

-
- - - - - - - - - - - <#assign row = "even"> - <#if item_policies??> - <#list item_policies as rp> - - - - - - - - - <#if row == "even"> - <#assign row = "odd"> - <#else> - <#assign row = "even"> - - - -
<@dspace.message "ui.general.id" /><@dspace.message "ui.dspace-admin.general.action" /><@dspace.message "ui.dspace-admin.authorize-item-edit.eperson" /><@dspace.message "ui.dspace-admin.general.group" /> 
${rp.getID()} - ${rp.getActionText()} - - <#if rp.getEPerson()??> - ${rp.getEPerson().getEmail()} - <#else> - ${"..."} - - - <#if rp.getGroup()??> - ${rp.getGroup().getName()} - <#else> - ${"..."} - - -
"> - - - " /> - " /> -
-
- - <#if bundles??> - <#list bundles as myBun> - <#if bundle_policies??> - <#assign myPolicies = bundle_policies.get(new Integer(myBun.getID()))> - <#assign showingArgs=[myBun.getName(), myBun.getID()]> -

<@dspace.messageArgs "ui.dspace-admin.authorize-item-edit.bundle", showingArgs />

- -
"> - -

- - - " /> -

-
- - - - - - - - - - - <#assign row = "even"> - <#list myPolicies as rp> - - - - - - - - - <#if row == "even"> - <#assign row = "odd"> - <#else> - <#assign row = "even"> - - -
<@dspace.message "ui.general.id" /><@dspace.message "ui.dspace-admin.general.action" /><@dspace.message "ui.dspace-admin.general.eperson" /><@dspace.message "ui.dspace-admin.general.group" /> 
${rp.getID()} - ${rp.getActionText()} - - <#if rp.getEPerson()??> - ${rp.getEPerson().getEmail()} - - - <#if rp.getGroup()??> - ${rp.getGroup().getName()} - - -
"> - - - - " /> - " /> -
-
- - <#assign bitstreams = myBun.getBitstreams()> - <#list bitstreams as myBits> - <#if bitstream_policies??> - <#assign myPolicies = bitstream_policies.get(new Integer(myBits.getID()))> - - <#assign showingArgs=[myBits.getID(), myBits.getName()]> -

<@dspace.messageArgs "ui.dspace-admin.authorize-item-edit.bundle", showingArgs />

-
"> -

- - - " /> -

-
- - - - - - - - - <#assign row = "even"> - <#list myPolicies as rp> - - - - - - - - - <#if row == "even"> - <#assign row = "odd"> - <#else> - <#assign row = "even"> - - -
<@dspace.message "ui.general.id" /><@dspace.message "ui.dspace-admin.general.action" /><@dspace.message "ui.dspace-admin.authorize-item-edit.eperson" /><@dspace.message "ui.dspace-admin.general.group" /> 
${rp.getID()} - ${rp.getActionText()} - - <#if rp.getEPerson()??> - ${rp.getEPerson().getEmail()} - <#else> - ${"..."} - - - <#if rp.getGroup()??> - ${rp.getGroup().getName()} - <#else> - ${"..."} - - -
- - - - " /> - " /> -
-
- - - - - - - - - - - - - - +<#import "/includes/dspace.ftl" as dspace /> + + + + + + +
+ <#if item??> + <#if item.getHandle()??> + <#assign showingArgs=[item.getHandle(), item.getID()]> + <#else> + <#assign showingArgs=["null", item.getID()]> + +

<@dspace.messageArgs "ui.dspace-admin.authorize-item-edit.policies", showingArgs />

+ + 		+ " onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.help" /> +
+ +

<@dspace.message "ui.dspace-admin.authorize-item-edit.text1" />

+

<@dspace.message "ui.dspace-admin.authorize-item-edit.text2" />

+ +

<@dspace.message "ui.dspace-admin.authorize-item-edit.item" />

+ +
"> +

+ + " /> +

+
+ + + + + + + + + + <#assign row = "even"> + <#if item_policies??> + <#list item_policies as rp> + + + + + + + + <#if row == "even"> + <#assign row = "odd"> + <#else> + <#assign row = "even"> + + + +
<@dspace.message "ui.general.id" /><@dspace.message "ui.dspace-admin.general.action" /><@dspace.message "ui.dspace-admin.authorize-item-edit.eperson" /><@dspace.message "ui.dspace-admin.general.group" /> 
${rp.getID()}${rp.getActionText()} + <#if rp.getEPerson()??> + ${rp.getEPerson().getEmail()} + <#else> + ${"..."} + + + <#if rp.getGroup()??> + ${rp.getGroup().getName()} + <#else> + ${"..."} + + +
"> + + + " /> + " /> +
+
+ +<#if bundles??> + <#list bundles as myBun> + <#if bundle_policies??> + <#assign myPolicies = bundle_policies.get(new Integer(myBun.getID()))> + <#assign showingArgs=[myBun.getName(), myBun.getID()]> +

<@dspace.messageArgs "ui.dspace-admin.authorize-item-edit.bundle", showingArgs />

+ +
"> +

+ + + " /> +

+
+ + + + + + + + + + + <#assign row = "even"> + <#list myPolicies as rp> + + + + + + + + <#if row == "even"> + <#assign row = "odd"> + <#else> + <#assign row = "even"> + + +
<@dspace.message "ui.general.id" /><@dspace.message "ui.dspace-admin.general.action" /><@dspace.message "ui.dspace-admin.general.eperson" /><@dspace.message "ui.dspace-admin.general.group" /> 
${rp.getID()}${rp.getActionText()}<#if rp.getEPerson()??>${rp.getEPerson().getEmail()}<#if rp.getGroup()??>${rp.getGroup().getName()} +
"> + + + + " /> + " /> +
+
+ + <#assign bitstreams = myBun.getBitstreams()> + <#list bitstreams as myBits> + <#if bitstream_policies??> + <#assign myPolicies = bitstream_policies.get(new Integer(myBits.getID()))> + + <#assign showingArgs=[myBits.getID(), myBits.getName()]> +

<@dspace.messageArgs "ui.dspace-admin.authorize-item-edit.bundle", showingArgs />

+
"> +

+ + + " /> +

+
+ + + + + + + + + <#assign row = "even"> + <#list myPolicies as rp> + + + + + + + + <#if row == "even"> + <#assign row = "odd"> + <#else> + <#assign row = "even"> + + +
<@dspace.message "ui.general.id" /><@dspace.message "ui.dspace-admin.general.action" /><@dspace.message "ui.dspace-admin.authorize-item-edit.eperson" /><@dspace.message "ui.dspace-admin.general.group" /> 
${rp.getID()}${rp.getActionText()} + <#if rp.getEPerson()??> + ${rp.getEPerson().getEmail()} + <#else> + ${"..."} + + + <#if rp.getGroup()??> + ${rp.getGroup().getName()} + <#else> + ${"..."} + + +
+ + + + " /> + " /> +
+
+ + + + diff --git a/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-main.ftl b/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-main.ftl index a4a72f2..14e0b9a 100644 --- a/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-main.ftl +++ b/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-main.ftl @@ -1,47 +1,39 @@ -<#import "/includes/dspace.ftl" as dspace /> - - - - - - - -
- <%--

Choose a resource to manage policies for:

--%> -

<@dspace.message "ui.dspace-admin.authorize-main.choose" />

- 		- " onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.help" /> -
- -
"> - -
- - - - - - - - - - - - - -
- <%-- --%> - " /> -
- <%-- --%> - " /> -
- <%-- --%> - " /> -
- <%-- --%> - " /> -
-
- -
\ No newline at end of file +<#import "/includes/dspace.ftl" as dspace /> + + + + + + +
+

<@dspace.message "ui.dspace-admin.authorize-main.choose" />

+ 		+ " onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.help" /> +
+ +
"> +
+ + + + + + + + + + + + + +
+ " /> +
+ " /> +
+ " /> +
+ " /> +
+
+
\ No newline at end of file diff --git a/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-policy-edit.ftl b/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-policy-edit.ftl index bf38630..14c44a2 100644 --- a/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-policy-edit.ftl +++ b/freemarkerui-webapp/src/main/webapp/pages/admin/authorize-policy-edit.ftl @@ -1,73 +1,63 @@ -<#import "/includes/dspace.ftl" as dspace /> - - - - - - - - -
- <#if edit_title??><#assign showingArgs=["${edit_title}"]> -

<@dspace.messageArgs "ui.dspace-admin.authorize-policy-edit.heading", showingArgs />

- 		- " onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.help" /> -
- -
" method="post"> - - - - <%-- --%> - - - - <%-- --%> - - - - -
Group: - -
Action:
- <#if id_name?? && id??> - <#if policy??> - -
- - <#if newpolicy??> - -
- - - - - -
- <%-- --%> - " /> - - <%-- --%> - " /> -
-
-
- - - - - +<#import "/includes/dspace.ftl" as dspace /> + + + + + + + + +
+ <#if edit_title??> + <#assign showingArgs=["${edit_title}"]> +

<@dspace.messageArgs "ui.dspace-admin.authorize-policy-edit.heading", showingArgs />

+ + 		+ " onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.help" /> +
+ +
" method="post"> + + + + + + + + + +
+ +
+ <#if id_name?? && id??> + <#if policy??> + +
+ <#if newpolicy??> +
+ + + + + +
+ " /> + + " /> +
+
+
diff --git a/freemarkerui-webapp/src/main/webapp/pages/admin/collection-select.ftl b/freemarkerui-webapp/src/main/webapp/pages/admin/collection-select.ftl index acf9d34..788278f 100644 --- a/freemarkerui-webapp/src/main/webapp/pages/admin/collection-select.ftl +++ b/freemarkerui-webapp/src/main/webapp/pages/admin/collection-select.ftl @@ -1,38 +1,33 @@ -<#import "/includes/dspace.ftl" as dspace /> - -<%--

Collections:

--%> -

<@dspace.message "ui.dspace-admin.collection-select.col" />

- -
"> - - - - - -
- -
- -
- - - - - -
- <%-- --%> - " /> - - <%-- --%> - " /> -
-
-
\ No newline at end of file +<#import "/includes/dspace.ftl" as dspace /> + +

<@dspace.message "ui.dspace-admin.collection-select.col" />

+
"> + + + + +
+ +
+ +
+ + + + + +
+ " /> + + " /> +
+
+
diff --git a/freemarkerui-webapp/src/main/webapp/pages/admin/community-select.ftl b/freemarkerui-webapp/src/main/webapp/pages/admin/community-select.ftl index 6add8e8..614fbb9 100644 --- a/freemarkerui-webapp/src/main/webapp/pages/admin/community-select.ftl +++ b/freemarkerui-webapp/src/main/webapp/pages/admin/community-select.ftl @@ -1,39 +1,34 @@ -<#import "/includes/dspace.ftl" as dspace /> - -

<@dspace.message "ui.dspace-admin.community-select.com" />

- -
"> - - - - - -
- -
- -
- - - - - - -
- <%-- --%> - " /> - - <%-- --%> - " /> -
- -
+<#import "/includes/dspace.ftl" as dspace /> + +

<@dspace.message "ui.dspace-admin.community-select.com" />

+ +"> + + + + +
+ +
+ +
+ + + + + +
+ " /> + + " /> +
+
\ No newline at end of file diff --git a/freemarkerui-webapp/src/main/webapp/pages/admin/edit-item-form.ftl b/freemarkerui-webapp/src/main/webapp/pages/admin/edit-item-form.ftl index 8123554..1fd509f 100644 --- a/freemarkerui-webapp/src/main/webapp/pages/admin/edit-item-form.ftl +++ b/freemarkerui-webapp/src/main/webapp/pages/admin/edit-item-form.ftl @@ -1,268 +1,223 @@ -<#import "/includes/dspace.ftl" as dspace /> - - - - - - -

<@dspace.message "ui.tools.edit-item-form.title" />

- -

<@dspace.message "ui.tools.edit-item-form.note" />

- -
- " - onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.morehelp" /> -
- - - -
"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Item Internal ID: - ${item.getID()!"ERROR"}
- Handle: - ${item.getHandle()!"None"}
- Last Modified: - ${item.getLastModified().toString()!""}
- Item Page: - - "><@dspace.url "/handle/${item.getHandle()}" /> -
- Edit item's authorization policies: - - Authorize... -
- Withdraw item from the repository: - - <#if item.isWithdrawn() > - Item is withdrawn - - <#else > - - -
- Move item to another collection: - - Move... -
- Completely expunge item: - - -
-
- -
"> - - - - - - - - - - <#assign row = 0> - - <#list values as value> - - - - - <#----> - - - <#assign row = row +1> - - - - - - - - - - - - - -
Schema Element QualifierValueLanguage
${value.schema!""} - .${value.element!""}.${value.qualifier!""}Remove Remove
Add New Metadata
- - -
-
- - - -<#if RequestParameters['event']??> -

<@dspace.message "ui.admin.event.${RequestParameters['event']}" />

- - - -
- - -
- -
- - - - - - - - - - - - -<#list item.getBundles() as bundle> - - - - <#list bundle.getBitstreams() as bitstream> - - "> - - - - - - - - - - - - - - - - -
NameDescriptionFormatViewEditDelete
Bundle: ${bundle.getName()}
${bitstream.getName()!""}${bitstream.getDescription()!""}${bitstream.getFormatDescription()!""}">View">Edit
 
">Upload a new bitstream -
- - - +<#import "/includes/dspace.ftl" as dspace /> + + + + + + +

<@dspace.message "ui.tools.edit-item-form.title" />

+ +

<@dspace.message "ui.tools.edit-item-form.note" />

+ +
+ " onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.morehelp" /> +
+ + + +
"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Item Internal ID:${item.getID()!"ERROR"}
Handle:${item.getHandle()!"None"}
Last Modified:${item.getLastModified().toString()!""}
Item Page:"><@dspace.url "/handle/${item.getHandle()}" />
Edit item's authorization policies:Authorize...
Withdraw item from the repository: + <#if item.isWithdrawn() > + Item is withdrawn + + <#else > + + +
Move item to another collection:Move...
Completely expunge item: + +
+
+ +
"> + + + + + + + + + + <#assign row = 0> + + <#list values as value> + + + + + + + <#assign row = row +1> + + + + + + + + + + + + + +
Schema Element QualifierValueLanguage
${value.schema!""}.${value.element!""}.${value.qualifier!""}Remove
Add New Metadata
+ +
+
+ <#if RequestParameters['event']??> +

<@dspace.message "ui.admin.event.${RequestParameters['event']}" />

+ +
+ + +
+
+ + + + + + + + + + + + <#list item.getBundles() as bundle> + + + + <#list bundle.getBitstreams() as bitstream> + + "> + + + + + + + + + + + + + + + + +
NameDescriptionFormatViewEditDelete
Bundle: ${bundle.getName()}
${bitstream.getName()!""}${bitstream.getDescription()!""}${bitstream.getFormatDescription()!""}">View">Edit
 
">Upload a new bitstream
+ diff --git a/freemarkerui-webapp/src/main/webapp/pages/admin/item-metadata.ftl b/freemarkerui-webapp/src/main/webapp/pages/admin/item-metadata.ftl index fd874ce..a358e54 100644 --- a/freemarkerui-webapp/src/main/webapp/pages/admin/item-metadata.ftl +++ b/freemarkerui-webapp/src/main/webapp/pages/admin/item-metadata.ftl @@ -130,7 +130,6 @@ - diff --git a/freemarkerui-webapp/src/main/webapp/pages/item.ftl b/freemarkerui-webapp/src/main/webapp/pages/item.ftl index 2fa5efe..1e2788f 100644 --- a/freemarkerui-webapp/src/main/webapp/pages/item.ftl +++ b/freemarkerui-webapp/src/main/webapp/pages/item.ftl @@ -30,7 +30,7 @@ Select LinkFile SizeFile Format <#list nonInternalBitstreams as bitstream> -

">${bitstream.getName()}

${bitstream.getSize()}${bitstream.getFormatDescription()} + ">${bitstream.getName()}${bitstream.getSize()}${bitstream.getFormatDescription()} <#else> diff --git a/freemarkerui-webapp/src/main/webapp/pages/register/profile-form.ftl b/freemarkerui-webapp/src/main/webapp/pages/register/profile-form.ftl index 86678e5..78aa95b 100644 --- a/freemarkerui-webapp/src/main/webapp/pages/register/profile-form.ftl +++ b/freemarkerui-webapp/src/main/webapp/pages/register/profile-form.ftl @@ -1,46 +1,33 @@ - - - <%-- --%> - - - - - - - - - <%-- --%> - - - - - - - -
First name*:<@dspace.message "ui.register.profile-form.fname.field" /><#if firstName??> - <#else> - -
<#if lastName??> - <#else>
Contact telephone:<#if phone??><#else>
- - - -
+ + <@dspace.message "ui.register.profile-form.fname.field" /> + + + + + + + + + + + + + + + + + diff --git a/webmvc-api/src/main/java/org/dspace/webmvc/controller/BrowseHierarchyController.java b/webmvc-api/src/main/java/org/dspace/webmvc/controller/BrowseHierarchyController.java index 2bfb19c..1cd9093 100644 --- a/webmvc-api/src/main/java/org/dspace/webmvc/controller/BrowseHierarchyController.java +++ b/webmvc-api/src/main/java/org/dspace/webmvc/controller/BrowseHierarchyController.java @@ -37,10 +37,7 @@ protected String handleRequestInternal(@RequestAttribute Context context, ModelM model.addAttribute("communityMap", bhrp.getCommunityMap()); model.addAttribute("topLevelCommunities", bhrp.getTopLevelCommunities()); - // can they admin communities? - if (AuthorizeManager.isAdmin(context)) - { - // set a variable to create an edit button + if (AuthorizeManager.isAdmin(context)) { model.addAttribute("admin_button", Boolean.TRUE); } diff --git a/webmvc-api/src/main/java/org/dspace/webmvc/controller/HandleController.java b/webmvc-api/src/main/java/org/dspace/webmvc/controller/HandleController.java index e758be3..850a4fc 100644 --- a/webmvc-api/src/main/java/org/dspace/webmvc/controller/HandleController.java +++ b/webmvc-api/src/main/java/org/dspace/webmvc/controller/HandleController.java @@ -68,5 +68,5 @@ public String processHandle(@RequestAttribute Context context, HttpServletReques } return "pages/invalidhandle"; - }//end processHandle + } } diff --git a/webmvc-api/src/main/java/org/dspace/webmvc/controller/RegisterController.java b/webmvc-api/src/main/java/org/dspace/webmvc/controller/RegisterController.java index fdaefb0..506ccb6 100644 --- a/webmvc-api/src/main/java/org/dspace/webmvc/controller/RegisterController.java +++ b/webmvc-api/src/main/java/org/dspace/webmvc/controller/RegisterController.java @@ -75,11 +75,9 @@ public class RegisterController { @RequestMapping("/register/**") - protected String register(@RequestAttribute Context context, ModelMap model, @RequestParam(value="step",required=false, defaultValue = "0") int step, HttpServletRequest request, - HttpServletResponse response) throws ServletException, IOException, - SQLException, AuthorizeException { - - + protected String register(@RequestAttribute Context context, ModelMap model, @RequestParam(value="step",required=false, defaultValue = "0") int step, + HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException, SQLException, AuthorizeException { + // set all incoming encoding to UTF-8 request.setCharacterEncoding("UTF-8"); @@ -92,9 +90,7 @@ protected String register(@RequestAttribute Context context, ModelMap model, @Re } if (token == null) { //First registration step: Key in email - if (ldap_enabled) { - return "pages/register/new-ldap-user"; } @@ -147,8 +143,7 @@ protected String register(@RequestAttribute Context context, ModelMap model, @Re //request.setAttribute("token", token); model.addAttribute("token", token); Locale[] supportedLocales = I18nUtil.getSupportedLocales(); - request.getSession().setAttribute("supportedLocales", supportedLocales); - //model.addAttribute("supportedLocales", supportedLocales); + model.addAttribute("supportedLocales", supportedLocales); if (email != null) { // Indicate if user can set password @@ -165,10 +160,8 @@ protected String register(@RequestAttribute Context context, ModelMap model, @Re }//end doregister @RequestMapping("/forgot/**") - protected String forgot(@RequestAttribute Context context, ModelMap model, @RequestParam(value="step",required=false, defaultValue = "0") int step, HttpServletRequest request, - HttpServletResponse response) throws ServletException, IOException, - SQLException, AuthorizeException { - + protected String forgot(@RequestAttribute Context context, ModelMap model, @RequestParam(value="step",required=false, defaultValue = "0") int step, + HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException, SQLException, AuthorizeException { // set all incoming encoding to UTF-8 request.setCharacterEncoding("UTF-8"); @@ -233,31 +226,26 @@ protected String submit(@RequestAttribute Context context, ModelMap model, int s // TODO Add integrity error in MVC style - remove the code below // log.warn(LogManager.getHeader(context, "integrity_error", UIUtil.getRequestLogInfo(request))); // JSPManager.showIntegrityError(request, response); - }//end switch + } //view resolver cannot deal with a String object return returnPath; // return "pages/home"; - }//end submit + } - private String processEnterEmail(@RequestAttribute Context context, ModelMap model, HttpServletRequest request, - HttpServletResponse response) throws ServletException, IOException, - SQLException, AuthorizeException { + private String processEnterEmail(@RequestAttribute Context context, ModelMap model, HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException, SQLException, AuthorizeException { Object checkRegister = request.getSession().getAttribute("register"); if (checkRegister == null) { registering = false; - }//end if - else { + } else { registering = true; - request.getSession().setAttribute("request", null); } - String email = request.getParameter("email"); - if (email == null || email.length() > 64) { // Malformed request or entered value is too long. email = ""; @@ -272,10 +260,8 @@ private String processEnterEmail(@RequestAttribute Context context, ModelMap mod model.addAttribute("password", password); model.addAttribute("email", email); - EPerson eperson = EPerson.findByEmail(context, email); - EPerson eperson2 = null; if (netid != null) { eperson2 = EPerson.findByNetid(context, netid.toLowerCase()); @@ -285,68 +271,43 @@ private String processEnterEmail(@RequestAttribute Context context, ModelMap mod if (registering) { // If an already-active user is trying to register, inform them so if ((eperson != null && eperson.canLogIn()) || (eperson2 != null && eperson2.canLogIn())) { - log.info(LogManager.getHeader(context, - "already_registered", "email=" + email)); - - + log.info(LogManager.getHeader(context, "already_registered", "email=" + email)); return "pages/register/already-registered"; - } else { // Find out from site authenticator whether this email can // self-register - boolean canRegister = - AuthenticationManager.canSelfRegister(context, request, email); + boolean canRegister = AuthenticationManager.canSelfRegister(context, request, email); if (canRegister) { - //-- registering by email if ((!ldap_enabled) || (netid == null) || (netid.trim().equals(""))) { - - // OK to register. Send token. - log.info(LogManager.getHeader(context, - "sendtoken_register", "email=" + email)); + log.info(LogManager.getHeader(context, "sendtoken_register", "email=" + email)); try { - AccountManager.sendRegistrationInfo(context, email); - } catch (javax.mail.SendFailedException e) { if (e.getNextException() instanceof SMTPAddressFailedException) { // If we reach here, the email is email is invalid for the SMTP server (i.e. fbotelho). - log.info(LogManager.getHeader(context, - "invalid_email", - "email=" + email)); - + log.info(LogManager.getHeader(context, "invalid_email", "email=" + email)); model.addAttribute("retry", Boolean.TRUE); - return "pages/register/new-user"; } else { - throw e; } } catch (Exception ex) { - ex.printStackTrace(); } context.complete(); return "pages/register/registration-sent"; - /*JSPManager.showJSP(request, response, - "/register/registration-sent.jsp");*/ - - // Context needs completing to write registration data - - } - //-- registering by netid - else { + } else { + //-- registering by netid //--------- START LDAP AUTH SECTION ------------- if (password != null && !password.equals("")) { //int returnValue = AuthenticationManager.authenticate(context, netid, password, null, request); - //if(returnValue!=AuthenticationManager.) - String ldap_provider_url = ConfigurationManager.getProperty("ldap.provider_url"); String ldap_id_field = ConfigurationManager.getProperty("ldap.id_field"); String ldap_search_context = ConfigurationManager.getProperty("ldap.search_context"); @@ -369,34 +330,23 @@ private String processEnterEmail(@RequestAttribute Context context, ModelMap mod ctx.close(); } catch (NamingException e) { // If we reach here, supplied email/password was duff. - log.info(LogManager.getHeader(context, - "failed_login", - "netid=" + netid + e)); - //JSPManager.showJSP(request, response, "/login/ldap-incorrect.jsp"); + log.info(LogManager.getHeader(context, "failed_login", "netid=" + netid + e)); return "pages/login/ldap-incorrect"; } } //--------- END LDAP AUTH SECTION ------------- - // Forward to "personal info page" - //JSPManager.showJSP(request, response, "/register/registration-form.jsp"); Locale[] supportedLocales = I18nUtil.getSupportedLocales(); - request.getSession().setAttribute("supportedLocales", supportedLocales); - //model.addAttribute("supportedLocales", supportedLocales); + model.addAttribute("supportedLocales", supportedLocales); return "pages/register/registration-form"; } } else { - /*JSPManager.showJSP(request, response, - "/register/cannot-register.jsp");*/ - return "pages/register/cannot-register"; } } } else { if (eperson == null) { - // Invalid email address - log.info(LogManager.getHeader(context, "unknown_email", - "email=" + email)); + log.info(LogManager.getHeader(context, "unknown_email", "email=" + email)); //request.setAttribute("retry", Boolean.TRUE); model.addAttribute("retry", Boolean.TRUE); @@ -408,36 +358,20 @@ private String processEnterEmail(@RequestAttribute Context context, ModelMap mod } else if (!eperson.canLogIn()) { // Can't give new password to inactive user - log.info(LogManager.getHeader(context, - "unregistered_forgot_password", "email=" + email)); - - /*JSPManager.showJSP(request, response, - "/register/inactive-account.jsp");*/ + log.info(LogManager.getHeader(context, "unregistered_forgot_password", "email=" + email)); return "pages/register/inactive-account"; } else if (eperson.getRequireCertificate() && !registering) { // User that requires certificate can't get password - log.info(LogManager.getHeader(context, - "certificate_user_forgot_password", "email=" - + email)); - - /*JSPManager.showJSP(request, response, - "/error/require-certificate.jsp");*/ + log.info(LogManager.getHeader(context, "certificate_user_forgot_password", "email=" + email)); return "pages/error/require-certificate"; - - } else { - - // OK to send forgot pw token. - log.info(LogManager.getHeader(context, - "sendtoken_forgotpw", "email=" + email)); + log.info(LogManager.getHeader(context, "sendtoken_forgotpw", "email=" + email)); AccountManager.sendForgotPasswordInfo(context, email); - /*JSPManager.showJSP(request, response, - "/register/password-token-sent.jsp");*/ // Context needs completing to write registration data context.complete(); @@ -475,33 +409,21 @@ private String processEnterEmail(@RequestAttribute Context context, ModelMap mod return ""; }//end process email - private String processPersonalInfo(@RequestAttribute Context context, ModelMap model, - HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException, SQLException, - AuthorizeException { - + private String processPersonalInfo(@RequestAttribute Context context, ModelMap model, HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException, SQLException, AuthorizeException { // Get the token String token = request.getParameter("token"); - String email = AccountManager.getEmail(context, token); - String netid = request.getParameter("netid"); if ((netid != null) && (email == null)) { email = request.getParameter("email"); } - // If the token isn't valid, show an error if (email == null && netid == null) { - log.info(LogManager.getHeader(context, "invalid_token", "token=" - + token)); - - - // Invalid token - /*JSPManager - .showJSP(request, response, "/register/invalid-token.jsp");*/ + log.info(LogManager.getHeader(context, "invalid_token", "token=" + token)); return "pages/register/invalid-token"; } @@ -523,19 +445,17 @@ private String processPersonalInfo(@RequestAttribute Context context, ModelMap m // Need to create new eperson // FIXME: TEMPORARILY need to turn off authentication, as usually // only site admins can create e-people - context.turnOffAuthorisationSystem(); eperson = EPerson.create(context); - eperson.setEmail(email); + if (netid != null) { eperson.setNetid(netid.toLowerCase()); } eperson.update(); - context.restoreAuthSystemState(); } @@ -555,15 +475,13 @@ private String processPersonalInfo(@RequestAttribute Context context, ModelMap m // If the user set a password, make sure it's OK boolean passwordOK = true; - if (!eperson.getRequireCertificate() && netid == null && - AuthenticationManager.allowSetPassword(context, request, eperson.getEmail())) { + if (!eperson.getRequireCertificate() && netid == null && AuthenticationManager.allowSetPassword(context, request, eperson.getEmail())) { passwordOK = confirmAndSetPassword(eperson, request); } if (infoOK && passwordOK) { // All registered OK. - log.info(LogManager.getHeader(context, "usedtoken_register", - "email=" + eperson.getEmail())); + log.info(LogManager.getHeader(context, "usedtoken_register", "email=" + eperson.getEmail())); // delete the token if (token != null) { @@ -581,8 +499,6 @@ private String processPersonalInfo(@RequestAttribute Context context, ModelMap m context.complete(); return "pages/register/registered"; - - } else { request.setAttribute("token", token); request.setAttribute("eperson", eperson); @@ -591,14 +507,9 @@ private String processPersonalInfo(@RequestAttribute Context context, ModelMap m request.setAttribute("passwordproblem", Boolean.valueOf(!passwordOK)); // Indicate if user can set password - boolean setPassword = AuthenticationManager.allowSetPassword( - context, request, email); - // request.setAttribute("set.password", Boolean.valueOf(setPassword)); + boolean setPassword = AuthenticationManager.allowSetPassword(context, request, email); model.addAttribute("setpassword", Boolean.valueOf(setPassword)); - /*JSPManager.showJSP(request, response, - "/register/registration-form.jsp");*/ - // Changes to/creation of e-person in DB cancelled context.abort(); @@ -606,11 +517,8 @@ private String processPersonalInfo(@RequestAttribute Context context, ModelMap m } } - private String processNewPassword(@RequestAttribute Context context, ModelMap model, - HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException, SQLException, - AuthorizeException { - + private String processNewPassword(@RequestAttribute Context context, ModelMap model, HttpServletRequest request, HttpServletResponse response) + throws ServletException, IOException, SQLException, AuthorizeException { // Get the token String token = request.getParameter("token"); @@ -620,12 +528,7 @@ private String processNewPassword(@RequestAttribute Context context, ModelMap mo // If the token isn't valid, show an error if (eperson == null) { - log.info(LogManager.getHeader(context, "invalid_token", "token=" - + token)); - - // Invalid token - /*JSPManager - .showJSP(request, response, "/register/invalid-token.jsp");*/ + log.info(LogManager.getHeader(context, "invalid_token", "token=" + token)); return "pages/register/invalid-token"; } @@ -639,26 +542,18 @@ private String processNewPassword(@RequestAttribute Context context, ModelMap mo boolean passwordOK = confirmAndSetPassword(eperson, request); if (passwordOK) { - log.info(LogManager.getHeader(context, "usedtoken_forgotpw", - "email=" + eperson.getEmail())); + log.info(LogManager.getHeader(context, "usedtoken_forgotpw", "email=" + eperson.getEmail())); eperson.update(); AccountManager.deleteToken(context, token); - /*JSPManager.showJSP(request, response, - "/register/password-changed.jsp");*/ context.complete(); return "pages/register/password-changed"; } else { - /*request.setAttribute("password.problem", Boolean.TRUE); - request.setAttribute("token", token); - request.setAttribute("eperson", eperson);*/ - model.addAttribute("passwordproblem", Boolean.TRUE); model.addAttribute("token", token); model.addAttribute("eperson", eperson); - // JSPManager.showJSP(request, response, "/register/new-password.jsp"); return "pages/register/new-password"; } } @@ -673,8 +568,7 @@ private String processNewPassword(@RequestAttribute Context context, ModelMap mo * @return true if the user supplied all the required information, false if * they left something out. */ - public static boolean updateUserProfile(EPerson eperson, - HttpServletRequest request) { + public static boolean updateUserProfile(EPerson eperson, HttpServletRequest request) { // Get the parameters from the form String lastName = request.getParameter("last_name"); String firstName = request.getParameter("first_name"); @@ -700,8 +594,7 @@ public static boolean updateUserProfile(EPerson eperson, * @param request the request containing the new password * @return true if everything went OK, or false */ - public static boolean confirmAndSetPassword(EPerson eperson, - HttpServletRequest request) { + public static boolean confirmAndSetPassword(EPerson eperson, HttpServletRequest request) { // Get the passwords String password = request.getParameter("password"); String passwordConfirm = request.getParameter("password_confirm"); diff --git a/webmvc-api/src/main/java/org/dspace/webmvc/controller/admin/ItemController.java b/webmvc-api/src/main/java/org/dspace/webmvc/controller/admin/ItemController.java index dc9f0d7..e7042bf 100644 --- a/webmvc-api/src/main/java/org/dspace/webmvc/controller/admin/ItemController.java +++ b/webmvc-api/src/main/java/org/dspace/webmvc/controller/admin/ItemController.java @@ -58,22 +58,11 @@ public String showItemMetadata(Model model, @PathVariable(value="id") Integer it model.addAttribute("item", item); DCValue[] values = item.getMetadata(Item.ANY, Item.ANY, Item.ANY, Item.ANY); model.addAttribute("values", values); - /* Flow of metadata edit - send current metadata to view - view builds form[ key, value, language] - controller process all params - clear all previous existing metadata - add metadata that came through HTTP - fancy UI could allow new fields to add additional field, controller shouldn't care - Save it. - - */ return "pages/admin/item-metadata"; } @RequestMapping(method = RequestMethod.GET, params = "edit", value = "/admin/item/{id}/edit") - public String processItemEdit(Model model, @PathVariable(value="id") Integer itemID, Context context)throws SQLException { - + public String processItemEdit(Model model, @PathVariable(value="id") Integer itemID, Context context) throws SQLException { Item item = Item.find(context, itemID); model.addAttribute("item", item); @@ -81,12 +70,10 @@ public String processItemEdit(Model model, @PathVariable(value="id") Integer ite model.addAttribute("values", values); model.addAttribute("prefix", ConfigurationManager.getProperty("handle.prefix")); return "pages/admin/edit-item-form"; - - } + } @RequestMapping(method = RequestMethod.POST, params = "withdraw", value = "/admin/item/{id}/**") - public String processItemWithdraw(@PathVariable(value="id") Integer itemID, HttpServletRequest request, Context context, Model model) throws SQLException, AuthorizeException, IOException { - + public String processItemWithdraw(@PathVariable(value="id") Integer itemID, Context context, Model model) throws SQLException, AuthorizeException, IOException { Item item = Item.find(context, itemID); item.withdraw(); context.commit(); @@ -95,8 +82,7 @@ public String processItemWithdraw(@PathVariable(value="id") Integer itemID, Http } @RequestMapping(method = RequestMethod.POST, params = "reinstate", value = "/admin/item/{id}/**") - public String processItemReinstate(@PathVariable(value="id") Integer itemID, HttpServletRequest request, Context context, Model model) throws SQLException, AuthorizeException, IOException { - + public String processItemReinstate(@PathVariable(value="id") Integer itemID, Context context, Model model) throws SQLException, AuthorizeException, IOException { Item item = Item.find(context, itemID); item.reinstate(); context.commit(); @@ -105,8 +91,7 @@ public String processItemReinstate(@PathVariable(value="id") Integer itemID, Htt } @RequestMapping(method = RequestMethod.POST, params = "delete", value = "/admin/item/{id}/**") - public String processItemDelete(@PathVariable(value="id") Integer itemID, HttpServletRequest request, Context context, Model model) throws SQLException, AuthorizeException, IOException { - + public String processItemDelete(@PathVariable(value="id") Integer itemID, Context context, Model model) throws SQLException, AuthorizeException, IOException { Item item = Item.find(context, itemID); Collection[] collections = item.getCollections(); for (Collection collection : collections) { @@ -118,7 +103,6 @@ public String processItemDelete(@PathVariable(value="id") Integer itemID, HttpSe @RequestMapping(method = RequestMethod.POST, params = "update", value = "/admin/item/{id}/metadata/**") public String processItemMetadataUpdate(@PathVariable(value="id") Integer itemID, Context context, HttpServletRequest request) throws SQLException, AuthorizeException, IOException { - Item item = Item.find(context, itemID); context.turnOffAuthorisationSystem(); item.clearMetadata(Item.ANY, Item.ANY, Item.ANY, Item.ANY); @@ -181,8 +165,7 @@ public String processItemMetadataUpdate(@PathVariable(value="id") Integer itemID context.restoreAuthSystemState(); return "redirect:/admin/item/" + itemID + "/bitstreams"; } - - + //@TODO Cancel }