Flow container scope

Author: labkey-nicka

flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java

@@ -867,6 +867,12 @@ private SampleIdMap<FlowFCSFile> getSelectedFCSFiles(ImportAnalysisForm form, Er
                             return null;
                         }
 
+                        if (!file.getContainer().equals(getContainer()))
+                        {
+                            errors.reject(ERROR_MSG, "Resolved FCS file '" + file.getName() + "' is not in this folder.");
+                            return null;
+                        }
+
                         if (!file.isOriginalFCSFile())
                         {
                             errors.reject(ERROR_MSG, "Resolved FCS file '" + file.getName() + "' is a FCS files created from importing an external analysis.");

flow/src/org/labkey/flow/controllers/well/WellController.java

@@ -305,7 +305,9 @@ public ModelAndView getView(EditWellForm form, boolean reshow, BindException err
 
                     for (String wellId : selected)
                     {
-                        _wells.add(FlowWell.fromWellId(Integer.parseInt(wellId)));
+                        FlowWell well = FlowWell.fromWellId(Integer.parseInt(wellId));
+                        well.checkContainer(getContainer(), getUser(), getActionURL());
+                        _wells.add(well);
                     }
                     DataRegionSelection.clearAll(form.getViewContext());
                 }