Create annotation to track UtilityActions and Admin Console page to list them

Author: bbimber

LDK/src/org/labkey/ldk/LDKController.java

@@ -889,135 +889,6 @@ public void addNavTrail(NavTree root)
         }
     }
 
-    @RequiresPermission(AdminPermission.class)
-    public static class MoveWorkbookAction extends ConfirmAction<MoveWorkbookForm>
-    {
-        private Container _movedWb = null;
-
-        @Override
-        public void validateCommand(MoveWorkbookForm form, Errors errors)
-        {
-
-        }
-
-        @Override
-        public ModelAndView getConfirmView(MoveWorkbookForm form, BindException errors) throws Exception
-        {
-            if (!getContainer().isWorkbook())
-            {
-                errors.reject(ERROR_MSG, "This is only supported for workbooks");
-                return new SimpleErrorView(errors);
-            }
-
-            String sb = "This will move this workbook to the selected folder, renaming this workbook to match the series in that container.  Note: there are many reasons this can be problematic, so please do this with great care<p>" +
-                    "<input name=\"targetContainer\" type=\"text\"></input>";
-
-            return new HtmlView(sb);
-        }
-
-        @Override
-        public boolean handlePost(MoveWorkbookForm form, BindException errors) throws Exception
-        {
-            Container toMove = getContainer();
-            if (!toMove.isWorkbook())
-            {
-                errors.reject(ERROR_MSG, "This is only supported for workbooks");
-                return false;
-            }
-
-            if (StringUtils.trimToNull(form.getTargetContainer()) == null)
-            {
-                errors.reject(ERROR_MSG, "Must provide target container");
-                return false;
-            }
-
-            Container target = ContainerManager.getForPath(StringUtils.trimToNull(form.getTargetContainer()));
-            if (target == null)
-            {
-                target = ContainerManager.getForId(StringUtils.trimToNull(form.getTargetContainer()));
-            }
-
-            if (target == null)
-            {
-                errors.reject(ERROR_MSG, "Unknown container: " + form.getTargetContainer());
-                return false;
-            }
-
-            if (target.isWorkbook())
-            {
-                errors.reject(ERROR_MSG, "Target cannot be a workbook: " + form.getTargetContainer());
-                return false;
-            }
-
-            if (ContainerManager.isSystemContainer(target))
-            {
-                errors.reject(ERROR_MSG, "Cannot move to system containers: " + form.getTargetContainer());
-                return false;
-            }
-
-            if (target.equals(toMove.getParent()))
-            {
-                errors.reject(ERROR_MSG, "Cannot move the workbook to its current parent: " + form.getTargetContainer());
-                return false;
-            }
-
-            //NOTE: transaction causing problems for larger sites?
-            //try (DbScope.Transaction transaction = CoreSchema.getInstance().getSchema().getScope().ensureTransaction())
-            //{
-                //first rename workbook to make unique
-                String tempName = new GUID().toString();
-                int sortOrder = (int)DbSequenceManager.get(target, ContainerManager.WORKBOOK_DBSEQUENCE_NAME).next();
-                _log.info("renaming workbook to in preparation for move from: " + toMove.getPath() + "  to: " + tempName);
-                ContainerManager.rename(toMove, getUser(), tempName);
-                toMove = ContainerManager.getForId(toMove.getId());
-
-                //then move parent
-                _log.info("moving workbook from: " + toMove.getPath() + "  to: " + target.getPath());
-                ContainerManager.move(toMove, target, getUser());
-                toMove = ContainerManager.getForId(toMove.getId());
-
-                //finally move to correct name
-                _log.info("renaming workbook from: " + toMove.getPath() + "  to: " + sortOrder);
-                ContainerManager.rename(toMove, getUser(), String.valueOf(sortOrder));
-                toMove.setSortOrder(sortOrder);
-                new SqlExecutor(CoreSchema.getInstance().getSchema()).execute("UPDATE core.containers SET SortOrder = ? WHERE EntityId = ?", toMove.getSortOrder(), toMove.getId());
-                toMove = ContainerManager.getForId(toMove.getId());
-
-                //transaction.commit();
-                _log.info("workbook move finished");
-
-                _movedWb = toMove;
-            //}
-
-            return true;
-        }
-
-        @NotNull
-        @Override
-        public URLHelper getSuccessURL(MoveWorkbookForm moveWorkbookForm)
-        {
-            if (_movedWb == null)
-                return getContainer().getStartURL(getUser());
-            else
-                return _movedWb.getStartURL(getUser());
-        }
-    }
-
-    public static class MoveWorkbookForm
-    {
-        private String _targetContainer;
-
-        public String getTargetContainer()
-        {
-            return _targetContainer;
-        }
-
-        public void setTargetContainer(String targetContainer)
-        {
-            _targetContainer = targetContainer;
-        }
-    }
-
     @RequiresNoPermission
     public class RedirectStartAction extends SimpleViewAction<Object>
     {

laboratory/src/org/labkey/laboratory/LaboratoryController.java

@@ -294,7 +294,6 @@ public boolean handlePost(EnsureAssayFieldsForm form, BindException errors) thro
         }
     }
 
-
     @RequiresPermission(AdminPermission.class)
     public class SetTableIncrementValueAction extends ConfirmAction<SetTableIncrementForm>
     {
@@ -578,7 +577,7 @@ public void validateCommand(Object form, Errors errors)
         @Override
         public ModelAndView getConfirmView(Object form, BindException errors) throws Exception
         {
-            return new HtmlView("This action will webparts and tabs for the current folder and all children to the default Laboratory FolderType, if these folders are either Laboratory Folders or Expt Workbooks");
+            return new HtmlView("This action will reset webparts and tabs for the current folder and all children to the default Laboratory FolderType, if these folders are either Laboratory Folders or Expt Workbooks");
         }
 
         @Override