#247 新規投稿時の公開範囲と共同編集者のデフォルト値の挙動を変更

クエリにグループが指定されてる場合はデフォルトで公開範囲と共同編集者として選択済みにするように変更
support-project · Jan 18, 2016 · 6f15eaa · 6f15eaa
1 parent 784af27
commit 6f15eaa
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/protect/KnowledgeControl.java
@@ -30,6 +30,7 @@
 import org.support.project.knowledge.entity.TagsEntity;
 import org.support.project.knowledge.entity.TemplateItemsEntity;
 import org.support.project.knowledge.entity.TemplateMastersEntity;
+import org.support.project.knowledge.logic.GroupLogic;
 import org.support.project.knowledge.logic.KnowledgeLogic;
 import org.support.project.knowledge.logic.TargetLogic;
 import org.support.project.knowledge.logic.UploadedFileLogic;
@@ -43,6 +44,7 @@
 import org.support.project.web.config.MessageStatus;
 import org.support.project.web.control.service.Get;
 import org.support.project.web.control.service.Post;
+import org.support.project.web.entity.GroupsEntity;
 import org.support.project.web.exception.InvalidParamException;
 
 @DI(instance=Instance.Prototype)
@@ -75,6 +77,21 @@ public Boundary view_add() {
 		setAttribute("templates", templates);
 
 		setAttribute("typeId", KnowledgeLogic.TEMPLATE_TYPE_KNOWLEDGE);
+
+		// グループが指定されてる場合はデフォルトで公開範囲と共同編集者を選択済みにする
+		String groupId = super.getParam("group", String.class);
+		if (StringUtils.isNotEmpty(groupId)) {
+			GroupsEntity group = GroupLogic.get().getEditAbleGroup(new Integer(groupId), getLoginedUser());
+			if (group == null) {
+				return sendError(HttpStatus.SC_403_FORBIDDEN, "");
+			}
+
+			String[] groupIds = { TargetLogic.ID_PREFIX_GROUP + groupId };
+			List<LabelValue> targets = TargetLogic.get().selectTargets(groupIds);
+			setAttribute("publicFlag", KnowledgeLogic.PUBLIC_FLAG_PROTECT);
+			setAttribute("groups", targets);
+			setAttribute("editors", targets);
+		}
 
 		return forward("view_add.jsp");
 	}

diff --git a/src/main/webapp/WEB-INF/views/protect/knowledge/view_add.jsp b/src/main/webapp/WEB-INF/views/protect/knowledge/view_add.jsp
@@ -40,11 +40,11 @@ var _SET_IMAGE_LABEL= '<%= jspUtil.label("knowledge.edit.set.image.path") %>';
 var _LABEL_UPDATE = '<%= jspUtil.label("label.update") %>';
 var _UPDATE_TITLE = '<%= jspUtil.label("knowledge.edit.title") %>';
 
-<c:forEach var="group" items="${groups}" varStatus="status">
-selectedGroups.push({label: '<%= jspUtil.out("group.label") %>', value: '<%= jspUtil.out("group.value") %>'});
+<c:forEach var="selectedGroup" items="${groups}" varStatus="status">
+selectedGroups.push({label: '<%= jspUtil.out("selectedGroup.label") %>', value: '<%= jspUtil.out("selectedGroup.value") %>'});
 </c:forEach>
-<c:forEach var="editor" items="${editors}" varStatus="status">
-selectedEditors.push({label: '<%= jspUtil.out("editor.label") %>', value: '<%= jspUtil.out("editor.value") %>'});
+<c:forEach var="selectedEditor" items="${editors}" varStatus="status">
+selectedEditors.push({label: '<%= jspUtil.out("selectedEditor.label") %>', value: '<%= jspUtil.out("selectedEditor.value") %>'});
 </c:forEach>
 
 var _TAGS = [];