Skip to content

Commit

Permalink
Merge pull request IQSS#4 from IQSS/master
Browse files Browse the repository at this point in the history 
new code
  • Loading branch information
@Jian881219
Jian881219 committed Sep 3, 2014
2 parents 7ff074f + 8626ada commit 856af7b
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 53 deletions.
8 changes: 4 additions & 4 deletions src/main/java/edu/harvard/iq/dataverse/ManageTemplatesPage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ public class ManageTemplatesPage {

@Inject
DataversePage dvpage;
@Inject

@Inject
TemplatePage tempPage;

@Inject
Expand Down Expand Up @@ -167,15 +167,15 @@ public Template getSelectedTemplate() {
public void setSelectedTemplate(Template selectedTemplate) {
this.selectedTemplate = selectedTemplate;
}

public void viewSelectedTemplate(Template selectedTemplate) {
this.selectedTemplate = selectedTemplate;
this.selectedTemplate.setMetadataValueBlocks();
tempPage.setTemplate(selectedTemplate);
}

public String updateTemplatesRoot(javax.faces.event.AjaxBehaviorEvent event) throws javax.faces.event.AbortProcessingException {
try {
try {
if (dataverse.getOwner() != null) {
if (isInheritTemplatesValue() && dataverse.getDefaultTemplate() == null && dataverse.getOwner().getDefaultTemplate() != null) {
dataverse.setDefaultTemplate(dataverse.getOwner().getDefaultTemplate());
Expand Down
1 change: 0 additions & 1 deletion src/main/java/edu/harvard/iq/dataverse/Template.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ private void initMetadataBlocksForCreate() {
metadataBlocksForEdit.put(mdb, sortDatasetFields(datasetFieldsForEdit));
}
}
System.out.print("size for edit init " + metadataBlocksForEdit.size());
}

public void setMetadataValueBlocks() {
Expand Down
10 changes: 0 additions & 10 deletions src/main/java/edu/harvard/iq/dataverse/TemplatePage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,13 @@ public void init() {
if (dvTemp.getId().longValue() == templateId) {
template = dvTemp;
}
}
if (dataverse != null){

}
template.setDataverse(dataverse);
template.setMetadataValueBlocks();
} else if (ownerId != null) {
// create mode for a new template
dataverse = dataverseService.find(ownerId);
System.out.print("create new template " + ownerId);
editMode = TemplatePage.EditMode.CREATE;
System.out.print("create new template " + dataverse.getName());
template = new Template(this.dataverse);
} else {
throw new RuntimeException("On Template page without id or ownerid."); // improve error handling
Expand All @@ -121,9 +116,6 @@ public String save() {
template.setCreateTime(new Timestamp(new Date().getTime()));
template.setUsageCount(new Long(0));
dataverse.getTemplates().add(template);

System.out.print("save new template " + dataverse.getTemplates().size());
System.out.print("save new template " + dataverse.getName());
cmd = new UpdateDataverseCommand(dataverse, null, null, session.getUser());
commandEngine.submit(cmd);
} else {
Expand Down Expand Up @@ -153,10 +145,8 @@ public String save() {
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Template Save Failed", " - " + ex.toString()));
//logger.severe(ex.getMessage());
}

editMode = null;
return "/manage-templates.xhtml?dataverseId=" + dataverse.getId() + "&faces-redirect=true";
//return "/template.xhtml?id=" + template.getId() + "&ownerId=" + dataverse.getId() + "&faces-redirect=true";
}

public void cancel() {
Expand Down
49 changes: 11 additions & 38 deletions src/main/webapp/template.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
<f:viewAction action="#{TemplatePage.init}" />
</f:metadata>

<h:form id="datasetForm">
<h:form id="templateForm">

<!-- Header / Button Panel -->
<ui:fragment rendered="#{empty TemplatePage.editMode}">
<!-- View mode -->
Expand All @@ -42,12 +43,11 @@
</div>
</div>
</div>

<h:outputLink styleClass="btn" value="/manage-templates.xhtml?dataverseId=#{TemplatePage.ownerId}">
<h:outputText value="Return to Manage Templates"/>
</h:outputLink>

<h:outputText id="name" value="#{TeplatePage.template.name}"/>
<h:outputText value="#{TeplatePage.template.name}"/>
<ui:include src="metadataFragment.xhtml"/>
</ui:fragment>

Expand All @@ -62,48 +62,21 @@
</label>
<div class="col-sm-9">
<p:inputText id="templateName" styleClass="form-control" value="#{TemplatePage.template.name}"/>
<p:message for="templateName"/>
</div>
</div>
</div>

<div id="contentTabs">
<p:tabView id="tabView" widgetVar="content" activeIndex="#{DatasetPage.selectedTabIndex}">
<p:tab id="metadataMapTab" title="Metadata" rendered="#{ (empty DatasetPage.editMode or DatasetPage.editMode == 'METADATA')}">
<ui:fragment rendered="#{!dataverseSession.user.guest and empty DatasetPage.editMode
and DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
and permissionServiceBean.on(DatasetPage.dataset).canIssueCommand('UpdateDatasetCommand')}">
<div class="containder" style="text-align:right; margin-bottom:.5em;">
<p:graphicImage value="/resources/images/icon_locked.png" rendered="#{DatasetPage.locked}"/>
<p:commandLink style="color:black;" styleClass="btn btn-default" title="Add + Edit Metadata" actionListener="#{DatasetPage.edit('METADATA')}" update="@form" oncomplete="javascript:post_edit_metadata()" disabled="#{DatasetPage.locked}">
<f:setPropertyActionListener target="#{DatasetPage.selectedTabIndex}" value="0" />
<span class="glyphicon glyphicon-pencil" style="margin-right:.3em;"/> Add + Edit Metadata
</p:commandLink>
</div>
</ui:fragment>
<div style="clear:left;">
<ui:include src="metadataFragment.xhtml"/>
</div>
</p:tab>
</p:tabView>
</div>
<ui:include src="metadataFragment.xhtml"/>
</ui:fragment>

<p:confirmDialog message="Are you sure you want to delete this template? This action may not be 'Undone'." header="Delete Template" widgetVar="deleteConfirmation">
<p:commandButton value="Continue" onclick="deleteConfirmation.hide()" action="#{TemplatePage.deleteTemplate()}">
</p:commandButton>
<p:commandButton value="Cancel" onclick="deleteConfirmation.hide()" type="button" />
</p:confirmDialog>
<!-- Create/Save Dataset Button Panel -->
<p:panel styleClass="panelLayoutButtonBlock" rendered="#{!empty TemplatePage.editMode}" >
<p:commandButton id="save" value="#{TemplatePage.editMode == 'CREATE' ? 'Create Dataset Template' : 'Save Changes'}" action="#{TemplatePage.save}" >
</p:commandButton>
<p:button id="cancelCreate" value="Cancel" outcome="/manage-templates.xhtml?dataverseId=#{TemplatePage.dataverse.id}" />
<h:commandButton type="submit" action="#{TemplatePage.save()}" class="btn btn-default"
value="#{TemplatePage.editMode == 'CREATE' ? 'Create Dataset Template' : 'Save Changes'}" />
<h:button class="btn btn-default"
value="Cancel" outcome="/manage-templates.xhtml?dataverseId=#{TemplatePage.dataverse.id}" />
</p:panel>
<p:commandButton value="Direct" id="templateSave"
style="display:none"
update=":datasetForm"
action="#{TemplatePage.save}">
</p:commandButton>

</h:form>
</ui:define>
</ui:composition>
Expand Down

0 comments on commit 856af7b

Please sign in to comment.