# HG changeset patch # User ymh # Date 1382490440 -7200 # Node ID 88af85c0c4c21d806788de7fde7cdd73068fb80d # Parent aee3af959f6db3076e5478470e62edff27883dc9# Parent ea1119d3210a2b7fa0a307f19cf1f41dcd99b6bc Merge with ea1119d3210a2b7fa0a307f19cf1f41dcd99b6bc diff -r ea1119d3210a -r 88af85c0c4c2 .hgtags --- a/.hgtags Fri Oct 04 11:13:51 2013 +0200 +++ b/.hgtags Wed Oct 23 03:07:20 2013 +0200 @@ -19,3 +19,4 @@ 603ffa4c6fa5db84222b0a2e8ad859d4d054d8b4 V00.06.03 98c137d6cc96102aab251319d49cf952ecc8e13e V00.06.04 93841dde3a3b7db087080c72d609a4fe0dfda028 V00.06.05 +c8b3700eaed6c76a73d715751fba62f3a7d49f3d V00.07 diff -r ea1119d3210a -r 88af85c0c4c2 server/src/main/java/org/iri_research/renkan/controller/RenkanController.java --- a/server/src/main/java/org/iri_research/renkan/controller/RenkanController.java Fri Oct 04 11:13:51 2013 +0200 +++ b/server/src/main/java/org/iri_research/renkan/controller/RenkanController.java Wed Oct 23 03:07:20 2013 +0200 @@ -80,9 +80,6 @@ this.logger.debug("renkanProject : " + project_id + " Accept : " + accept_header!=null?accept_header:"" + ", cowebkey: "+ cowebkey!=null?cowebkey:""); - if(accept_header != null && accept_header.matches(".*image/.*")) { - throw new HttpMediaTypeNotSupportedException("Do not produce image"); - } if(project_id == null || project_id.length() == 0) { throw new IllegalArgumentException("RenkanContoller.renkanProject: Project id is null or empty."); diff -r ea1119d3210a -r 88af85c0c4c2 server/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html --- a/server/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html Fri Oct 04 11:13:51 2013 +0200 +++ b/server/src/main/webapp/WEB-INF/templates/renkanProjectEdit.html Wed Oct 23 03:07:20 2013 +0200 @@ -76,7 +76,7 @@ ], }; var space_config = /*[[${space.binConfig}?${space.binConfig}:'{}']]*/"{}"; - space_config = JSON.parse(space_config); + space_config = JSON.parse(space_config || "{}"); var _renkan = new Rkns.Renkan($.extend({}, renkan_config, space_config)); var corenkanConfig = { projectId: /*[[${project.id}]]*/"new_project",