Skip to content

6339 subjects disappear on edit #6356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kcondon merged 24 commits into from
Dec 3, 2019
Merged

6339 subjects disappear on edit #6356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ea0cc6e
Merge branch 'develop' into 6339-subjects-disappear-on-edit
sekmiller Nov 8, 2019
83157c2
#6339 change div to scrollPanel
sekmiller Nov 8, 2019
72588a6
Merge branch 'develop' into 6339-subjects-disappear-on-edit
sekmiller Nov 8, 2019
707826e
Merge branch 'develop' into 6339-subjects-disappear-on-edit
sekmiller Nov 15, 2019
1adbeab
#6339 fix merge conflict
sekmiller Nov 15, 2019
1213b46
Merge branch 'develop' into 6339-subjects-disappear-on-edit
sekmiller Nov 15, 2019
7d8ad27
#6339 change to select many menu
sekmiller Nov 18, 2019
6a4a0aa
#6339 change to select checkbox menu control
sekmiller Nov 20, 2019
59ac88d
Merge branch 'develop' into 6339-subjects-disappear-on-edit
sekmiller Nov 20, 2019
9c2c08a
Cleaned up styling of new selectCheckboxMenu component in metadataFra…
mheppler Nov 20, 2019
5f3095f
Merge branch 'develop' into 6339-subjects-disappear-on-edit
mheppler Nov 20, 2019
8fa0516
Merge branch 'develop' into 6339-subjects-disappear-on-edit
sekmiller Nov 20, 2019
2e88543
Merge remote-tracking branch 'origin/6339-subjects-disappear-on-edit'…
sekmiller Nov 20, 2019
c7c2375
#6339 add conditional to "multiple"
sekmiller Nov 21, 2019
bd0b024
Merge branch 'develop' into 6339-subjects-disappear-on-edit
sekmiller Nov 21, 2019
d1c0628
Styled validation msg block for control vocab dropdown menus on metad…
mheppler Nov 21, 2019
c4c47f8
#6339 Add Ajax updates to selections from select menu check box
sekmiller Nov 21, 2019
45b1716
#6339 remove selected vals list
sekmiller Nov 22, 2019
10cfafc
Merge branch 'develop' into 6339-subjects-disappear-on-edit
sekmiller Nov 26, 2019
3844e7e
#6399 remove AJAX event from selectcheckboxmenu
sekmiller Nov 26, 2019
022c4c8
Merge branch 'develop' into 6339-subjects-disappear-on-edit
sekmiller Nov 26, 2019
0d2ddef
Merge branch 'develop' into 6339-subjects-disappear-on-edit
mheppler Dec 2, 2019
8897a23
#6339 show selected items
sekmiller Dec 2, 2019
51881e7
Merge branch 'develop' into 6339-subjects-disappear-on-edit
sekmiller Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4285,9 +4285,12 @@ public void handleSelection(final AjaxBehaviorEvent event) {
selectedTags = selectedTags.clone();
}
}



public void handleCVVSelection(final AjaxBehaviorEvent event) {
//Dummy method for AJAX update of items selected
}


private void refreshTabFileTagsByName(){

tabFileTagsByName= new ArrayList<>();
Expand Down
57 changes: 36 additions & 21 deletions src/main/webapp/metadataFragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,21 +150,30 @@
</div>
</div>
</ui:repeat>
<ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
<p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
id="unique1" rendered="#{!dsf.datasetFieldType.allowMultiples}">
<f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
<f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
</p:selectOneMenu>
<div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{dsf.datasetFieldType.allowMultiples}">
<p:selectManyCheckbox value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" layout="pageDirection"
id="unique2">
<f:selectItem itemLabel="#{bundle.select}" class="chkbox-label-margin" itemValue="" noSelectionOption="true"/>
<f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
</p:selectManyCheckbox>
</div>
<div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty dsf.validationMessage}">
<span class="ui-message-error-detail">#{dsf.validationMessage}</span>
<ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
<div class="form-group dataset-field-values">
<div class="form-col-container col-sm-9 edit-field">
<p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
id="unique1" required="#{dsf.required}" rendered="#{!dsf.datasetFieldType.allowMultiples}">
<f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
<f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
</p:selectOneMenu>
<!--
<p:outputPanel id="selectedValsList" style="padding-top:.5em;">
<ui:repeat value="#{dsf.controlledVocabularyValues}" var="cvv" rendered="#{!empty dsf.controlledVocabularyValues}">
<h:outputText value="#{cvv.localeStrValue}" style="margin-right:.5em;display:inline-block;"/>
</ui:repeat>
</p:outputPanel>
-->
<p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" styleClass="form-control"
filter="true" filterMatchMode="startsWith" label="#{bundle.select}" multiple="true"
id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples}">
<f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}"/>
</p:selectCheckboxMenu>
<div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty dsf.validationMessage}">
<span class="ui-message-error-detail">#{dsf.validationMessage}</span>
</div>
</div>
</div>
</ui:fragment>
</div>
Expand Down Expand Up @@ -212,12 +221,18 @@
<f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
<f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
</p:selectOneMenu>
<div class="ui-inputfield form-control select-scroll-block" jsf:rendered="#{subdsf.datasetFieldType.allowMultiples}">
<p:selectManyCheckbox value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
layout="pageDirection">
<!--
<p:outputPanel id="selectedValsListCompound" style="padding-top:.5em;">
<ui:repeat value="#{subdsf.controlledVocabularyValues}" var="cvv" rendered="#{!empty subdsf.controlledVocabularyValues}">
<h:outputText value="#{cvv.localeStrValue}" style="margin-right:.5em;display:inline-block;"/>
</ui:repeat>
</p:outputPanel>
-->
<p:selectCheckboxMenu value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
rendered="#{subdsf.datasetFieldType.allowMultiples}" label="#{bundle.select}" multiple="true" >
<f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
</p:selectManyCheckbox>
</div>
</p:selectCheckboxMenu>

<div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty subdsf.validationMessage}">
<span class="ui-message-error-detail">#{subdsf.validationMessage}</span>
</div>
Expand Down Expand Up @@ -254,4 +269,4 @@
</div>
</p:fragment>
</ui:fragment>
</ui:composition>
</ui:composition>