diff --git a/src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.html b/src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.html index e964d30d98..413a13117e 100644 --- a/src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.html +++ b/src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.html @@ -43,10 +43,10 @@ <!--</div>--> <!--</div>--> <div class="span-20"> - <div class="span-8"> - <label for="unitPanel">Filter by unit:</label><br/> - <span wicket:id="unitPanel"></span> - </div> + <!--<div class="span-8">--> + <!--<label for="unitPanel">Filter by unit:</label><br/>--> + <!--<span wicket:id="unitPanel"></span>--> + <!--</div>--> <div class="span-10"> <label for="researchAreaPanel">Filter by research area:</label> <span wicket:id="researchAreaPanel"></span> diff --git a/src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.java b/src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.java index 75d38de666..931b569faa 100644 --- a/src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.java +++ b/src/main/java/se/su/dsv/scipro/match/panel/AdminManageSupervisorPanel.java @@ -259,7 +259,7 @@ public class AdminManageSupervisorPanel extends Panel { private static final long serialVersionUID = 1L; private TextField<String> supervisorField, keywordField; - private FilterKeywordDropdownPanel researchAreaPanel, unitPanel; + private FilterKeywordDropdownPanel researchAreaPanel; //, unitPanel; public FilterForm(String id) { super(id); @@ -269,9 +269,9 @@ public class AdminManageSupervisorPanel extends Panel { add(keywordField); researchAreaPanel = new FilterKeywordDropdownPanel("researchAreaPanel", KeywordTypeDao.TYPE.RESEARCH_AREA); - unitPanel = new FilterKeywordDropdownPanel("unitPanel", KeywordTypeDao.TYPE.UNIT); +// unitPanel = new FilterKeywordDropdownPanel("unitPanel", KeywordTypeDao.TYPE.UNIT); - add(unitPanel); +// add(unitPanel); add(researchAreaPanel); AjaxButton filterButton = new AjaxButton("filterButton", new Model<String>("Filter")) { @@ -281,9 +281,9 @@ public class AdminManageSupervisorPanel extends Panel { protected void onSubmit(AjaxRequestTarget target, Form<?> form) { Set<Keyword> keywords = new HashSet<Keyword>(); - if(unitPanel.getSelectedKeywords()!=null&&!unitPanel.getSelectedKeywords().isEmpty()){ - keywords.addAll(unitPanel.getSelectedKeywords()); - } +// if(unitPanel.getSelectedKeywords()!=null&&!unitPanel.getSelectedKeywords().isEmpty()){ +// keywords.addAll(unitPanel.getSelectedKeywords()); +// } if(researchAreaPanel.getSelectedKeywords()!=null&&!researchAreaPanel.getSelectedKeywords().isEmpty()) { keywords.addAll(researchAreaPanel.getSelectedKeywords()); }