fixing MID-2342 - removed extra checkbox in report configuration page

Evolveum · Apr 22, 2015 · e9a4236 · e9a4236
1 parent 7a4d763
commit e9a4236
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 30 deletions.
diff --git a/...java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.html b/...java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.html
@@ -24,9 +24,6 @@ <h3 style="margin-left: 20px;"><wicket:message key="ReportConfigurationPanel.tit
             <div class="form-group" wicket:id="name" />
             <div class="form-group" wicket:id="description" />
 
-            <div class="form-group">
-            	<input type="checkbox" name="optionsRadios1" wicket:id="searchOnResource">
-            </div>
             <div class="form-group" wicket:id="exportType" />
 
         </div>

diff --git a/...java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java b/...java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java
@@ -72,30 +72,11 @@ protected void initLayout() {
                 createStringResource("ObjectType.description"), ID_LABEL_SIZE, ID_INPUT_SIZE, false);
         add(description);
 
-        CheckBox searchOnResourceCheckbox = new CheckBox(ID_SEARCH_ON_RESOURCE, new PropertyModel<Boolean>(getModel(), ID_SEARCH_ON_RESOURCE));
-        add(searchOnResourceCheckbox);
-
         IModel choices = WebMiscUtil.createReadonlyModelFromEnum(ExportType.class);
         IChoiceRenderer renderer = new EnumChoiceRenderer();
-//        ReportDto dto = new ReportDto();
-//        dto.setExportType(getModel().getObject().asObjectable().getExport());
         DropDownFormGroup exportType = new DropDownFormGroup(ID_EXPORT_TYPE, new
                 PropertyModel<ExportType>(getModel(), ReportDto.F_EXPORT_TYPE), choices, renderer,
                 createStringResource("ReportType.export"), ID_LABEL_SIZE, ID_INPUT_SIZE, false);
         add(exportType);
-//
-//        //todo useHibernateSession and orientation
-//
-//        IModel<ObjectWrapper> wrapper = new LoadableModel<ObjectWrapper>(false) {
-//
-//            @Override
-//            protected ObjectWrapper load() {
-//                PrismObject<ReportType> report = getModel().getObject().getObject();
-//
-//                return new ObjectWrapper(null, null, report, null, ContainerStatus.MODIFYING);
-//            }
-//        };
-//        PrismObjectPanel properties = new PrismObjectPanel(ID_PROPERTIES, wrapper, null, null);
-//        add(properties);
     }
 }
diff --git a/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java b/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/RunReportPopupPanel.java
@@ -174,16 +174,8 @@ private Component createTypedInputPanel(String componentId, final IModel<JasperR
 		InputPanel panel = null;
 		if (type.isEnum()){
 			panel = WebMiscUtil.createEnumPanel(type, componentId, new PropertyModel(model, expression), this);
-//			FormComponent component = panel.getBaseFormComponent();
-//			component.add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
-//			return panel;
 		} else if (XMLGregorianCalendar.class.isAssignableFrom(type)){
 			panel = new DatePanel(componentId, new PropertyModel<XMLGregorianCalendar>(model, expression));
-//			c.add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
-//			FormComponent component = date.getBaseFormComponent();
-//			component.add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
-//			return date;
-//			return new DateInput(componentId, new XmlGregorianCalendarModel(new PropertyModel<XMLGregorianCalendar>(model, expression)));
 		} else {
 			panel = new TextPanel<String>(componentId, new PropertyModel<String>(model, expression));
 		}