added check only when creating empty archives atm [see #110]

Author: FreakyBytes

src/main/java/de/unirostock/sems/cbarchive/web/dataholder/Archive.java

@@ -77,9 +77,10 @@ public class Archive implements Closeable {
 	public static final String TEMPLATE_HTTP		= "http";
 	public static final String TEMPLATE_EXISTING	= "existing";
 
-	protected String template	= TEMPLATE_PLAIN;
-	protected String id			= null;
-	protected String name		= null;
+	protected String template		= TEMPLATE_PLAIN;
+	protected boolean includeVCard	= false;
+	protected String id				= null;
+	protected String name			= null;
 
 	@JsonInclude(Include.NON_NULL) 
 	protected Map<String, ArchiveEntryDataholder> entries = null;
@@ -141,6 +142,14 @@ public String getTemplate() {
 	public void setTemplate(String template) {
 		this.template = template;
 	}
+	
+	public boolean isIncludeVCard() {
+		return includeVCard;
+	}
+
+	public void setIncludeVCard(boolean includeVCard) {
+		this.includeVCard = includeVCard;
+	}
 
 	@JsonIgnore
 	public void setArchiveFile(File file, Lock lock) throws CombineArchiveWebException {

src/main/java/de/unirostock/sems/cbarchive/web/rest/RestApi.java

@@ -587,8 +587,8 @@ public Response createArchive( @CookieParam(Fields.COOKIE_PATH) String userPath,
 				}
 			}
 			else {
-				// Ordinary creation
-				String id = user.createArchive( archive.getName(), user.getData().getVCard() );
+				// Ordinary creation (only include VCard, if checkbox is checked)
+				String id = user.createArchive( archive.getName(), archive.isIncludeVCard() ? user.getData().getVCard() : null );
 				archive.setId(id);
 			}
 

src/main/webapp/res/js/models.js

@@ -1690,6 +1690,7 @@ var CreateView = Backbone.View.extend({
 
 		var archiveName = this.$el.find("input[name='newArchiveName']").val();
 		var archiveTemplate = this.$el.find("input[name='newArchiveTemplate']:checked").val();
+		var includeVCard = this.$el.find("input[name='newArchvieIncludeVCard']").is(":checked");
 		var self = this;
 
 		if( archiveName == null || archiveName == undefined || archiveName == "" ) {
@@ -1698,7 +1699,8 @@ var CreateView = Backbone.View.extend({
 			return false;
 		}
 
-		var archiveModel = new ArchiveModel({"name": archiveName}, {"collection": workspaceArchives});
+		// set name and behavior for including own VCard
+		var archiveModel = new ArchiveModel({"name": archiveName, "includeVCard": includeVCard == true ? true : false }, {"collection": workspaceArchives});
 
 		if( !archiveModel.isValid() ) {
 			// model is not valid