Skip to content
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

Jump to bottom

4848 alphabetical templates #4912

Merged
merged 7 commits into from
Aug 1, 2018
Merged

4848 alphabetical templates #4912

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
15ba2f7
Unfinished changes #4848
benjamin-martinez Jul 30, 2018
7322e66
More unfinished changes #4848
benjamin-martinez Jul 30, 2018
d086827
Unifinished. The alphabetizeTemplates is not working as it should. #4848
benjamin-martinez Jul 30, 2018
80d28fb
These changes work, although they are terribly inefficient. #4848
benjamin-martinez Jul 31, 2018
665454c
Instantiate new template array to allow sorting #4848
matthew-a-dunlap Aug 1, 2018
1122618
Merge branch 'develop' into 4848-alphabetical-templates
matthew-a-dunlap Aug 1, 2018
dfe633c
remove unused import #4848
matthew-a-dunlap Aug 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 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 @@ -1167,7 +1167,7 @@ public Template getSelectedTemplate() {
public void setSelectedTemplate(Template selectedTemplate) {
this.selectedTemplate = selectedTemplate;
}

public void updateSelectedTemplate(ValueChangeEvent event) {

selectedTemplate = (Template) event.getNewValue();
Expand All @@ -1182,8 +1182,6 @@ public void updateSelectedTemplate(ValueChangeEvent event) {
resetVersionUI();
}



/*
// Original
private void updateDatasetFieldInputLevels() {
Expand Down Expand Up @@ -1545,10 +1543,12 @@ private String init(boolean initFull) {
return permissionsWrapper.notAuthorized();
}

dataverseTemplates = dataverseService.find(ownerId).getTemplates();
dataverseTemplates.addAll(dataverseService.find(ownerId).getTemplates());
if (!dataverseService.find(ownerId).isTemplateRoot()) {
dataverseTemplates.addAll(dataverseService.find(ownerId).getParentTemplates());
}
Collections.sort(dataverseTemplates, (Template t1, Template t2) -> t1.getName().compareToIgnoreCase(t2.getName()));

defaultTemplate = dataverseService.find(ownerId).getDefaultTemplate();
if (defaultTemplate != null) {
selectedTemplate = defaultTemplate;
Expand Down