Merge branch 'maint-rel-1.6' into develop

This commit is contained in:
j2blake 2013-11-20 17:07:04 -05:00
commit f3999dd48f
3 changed files with 4 additions and 4 deletions

View file

@ -17,9 +17,9 @@ public class SiteAdminController extends BaseSiteAdminController {
private static final Log log = LogFactory.getLog(SiteAdminController.class);
@Override
protected Map<String, String> getIndexCacheRebuildUrls(VitroRequest vreq) {
protected Map<String, String> getSiteMaintenanceUrls(VitroRequest vreq) {
Map<String, String> urls = super.getIndexCacheRebuildUrls(vreq);
Map<String, String> urls = super.getSiteMaintenanceUrls(vreq);
if (PolicyHelper.isAuthorizedForActions(vreq, ToolsRequestHandler.REQUIRED_ACTIONS)) {
urls.put("rebuildVisCache", UrlBuilder.getUrl("/vis/tools"));