Commit @cff6e85b7ec5541ee08eec43c4c7d3c67f7b1c91

[Notice] Announcing the End of Demo Server [Read me]

Ahn Hyeok Jun 2012-08-13

change url in boardApp using owner & using JODAdateUtil

@cff6e85b7ec5541ee08eec43c4c7d3c67f7b1c91

dec2d91

cff6e85

app/controllers/BoardApp.java

--- app/controllers/BoardApp.java

+++ app/controllers/BoardApp.java


 
 public class BoardApp extends Controller {
 
-    public static Result posts(String projectName) {
+    public static Result posts(String ownerName, String projectName) {
 
         Form<Post.Param> postParamForm = new Form<Post.Param>(Post.Param.class);
         Param postParam = postParamForm.bindFromRequest().get();
-        Project project = Project.findByName(projectName);
+        Project project = Project.findByNameAndOwner(ownerName, projectName);
+        
         
         return ok(postList.render("게시판", project,
                 Post.findOnePage(project.name, postParam.pageNum, Direction.getValue(postParam.order), postParam.key),
                 postParam));
     }
 
-    public static Result newPost(String projectName) {
-        Project project = Project.findByName(projectName);
+    public static Result newPost(String ownerName, String projectName) {
+        Project project = Project.findByNameAndOwner(ownerName, projectName);
         return ok(newPost.render("새 게시물", new Form<Post>(Post.class), project));
     }
 
-    public static Result savePost(String projectName) {
+    public static Result savePost(String ownerName, String projectName) {
         Form<Post> postForm = new Form<Post>(Post.class).bindFromRequest();
-        Project project = Project.findByName(projectName);
+        Project project = Project.findByNameAndOwner(ownerName, projectName);
         if (postForm.hasErrors()) {
             return ok(boardError.render("본문과 제목은 반드시 써야합니다.",
-                    routes.BoardApp.newPost(project.name), project));
+                    routes.BoardApp.newPost(project.owner, project.name), project));
         } else {
             Post post = postForm.get();
             post.authorId = UserApp.currentUser().id;

             Post.write(post);
         }
 
-        return redirect(routes.BoardApp.posts(project.name));
+        return redirect(routes.BoardApp.posts(project.owner, project.name));
     }
 
-    public static Result post(String projectName, Long postId) {
+    public static Result post(String ownerName, String projectName, Long postId) {
         Post post = Post.findById(postId);
-        Project project = Project.findByName(projectName);
+        Project project = Project.findByNameAndOwner(ownerName, projectName);
         if (post == null) {
             return ok(notExsitPage.render("존재하지 않는 게시물", project));
         } else {

         }
     }
 
-    public static Result saveComment(String projectName, Long postId) {
+    public static Result saveComment(String ownerName, String projectName, Long postId) {
         Form<Comment> commentForm = new Form<Comment>(Comment.class).bindFromRequest();
 
-        Project project = Project.findByName(projectName);
+        Project project = Project.findByNameAndOwner(ownerName, projectName);
         if (commentForm.hasErrors()) {
             return ok(boardError.render("본문은 반드시 쓰셔야 합니다.",
-                    routes.BoardApp.post(project.name, postId), project));
+                    routes.BoardApp.post(project.owner, project.name, postId), project));
 
         } else {
             Comment comment = commentForm.get();

             Comment.write(comment);
             Post.countUpCommentCounter(postId);
             
-            return redirect(routes.BoardApp.post(project.name, postId));
+            return redirect(routes.BoardApp.post(project.owner, project.name, postId));
         }
     }
 
-    public static Result deletePost(String projectName, Long postId) {
-        Project project = Project.findByName(projectName);
+    public static Result deletePost(String ownerName, String projectName, Long postId) {
+        Project project = Project.findByNameAndOwner(ownerName, projectName);
         Post.delete(postId);
-        return redirect(routes.BoardApp.posts(project.name));
+        return redirect(routes.BoardApp.posts(project.owner, project.name));
     }
 
-    public static Result editPost(String projectName, Long postId) {
+    public static Result editPost(String ownerName, String projectName, Long postId) {
         Post existPost = Post.findById(postId);
         Form<Post> editForm = new Form<Post>(Post.class).fill(existPost);
-        Project project = Project.findByName(projectName);
+        Project project = Project.findByNameAndOwner(ownerName, projectName);
 
         if (UserApp.currentUser().id == existPost.authorId) {
             return ok(editPost.render("게시물 수정", editForm, postId, project));
         } else {
-            return ok(boardError.render("글쓴이가 아닙니다.", routes.BoardApp.post(project.name, postId),
+            return ok(boardError.render("글쓴이가 아닙니다.", routes.BoardApp.post(project.owner, project.name, postId),
                     project));
         }
     }
 
-    public static Result updatePost(String projectName, Long postId) {
+    public static Result updatePost(String ownerName, String projectName, Long postId) {
         Form<Post> postForm = new Form<Post>(Post.class).bindFromRequest();
-        Project projcet = Project.findByName(projectName);
+        Project project = Project.findByNameAndOwner(ownerName, projectName);
 
         if (postForm.hasErrors()) {
             return ok("입력값이 잘못되었습니다.");

             post.authorId = UserApp.currentUser().id;
             post.id = postId;
             post.filePath = saveFile(request());
-            post.project = projcet;
+            post.project = project;
 
             Post.edit(post);
         }
 
-        return redirect(routes.BoardApp.posts(projcet.name));
+        return redirect(routes.BoardApp.posts(project.owner, project.name));
     }
 
     private static String saveFile(Request request) {

dec2d91

cff6e85

app/controllers/CodeApp.java

--- app/controllers/CodeApp.java

+++ app/controllers/CodeApp.java


 public class CodeApp extends Controller {
 
     public static Result view(String ownerName, String projectName, String path) throws IOException {
+        //FIXME use ownerName
         String vcs = Project.findByName(projectName).vcs;
         if (vcs.equals("GIT")) {
             return GitApp.viewCode(projectName, path);

     
     public static Result ajaxRequest(String ownerName, String projectName, String path) throws IOException, NoHeadException, GitAPIException {
         try {
+            //FIXME use ownerName
             return ok(new GitRepository(projectName).findFileInfo(path));
         } catch (NoHeadException e) {
             return forbidden();

dec2d91

cff6e85

app/models/Comment.java

--- app/models/Comment.java

+++ app/models/Comment.java


 package models;
 
+import java.util.*;
+
+import javax.persistence.*;
+
 import org.joda.time.Duration;
+
 import play.data.validation.Constraints;
 import play.db.ebean.Model;
 import utils.JodaDateUtil;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import java.util.Date;
-import java.util.List;
 
 @Entity
 public class Comment extends Model {

     public static List<Comment> findCommentsByPostId(Long postId) {
         return find.where().eq("post.id", postId).findList();
     }
-
-    public String calcPassTime() {
-        Duration dur = JodaDateUtil.ago(this.date);
-        if (dur.getStandardDays() > 0) {
-            return dur.getStandardDays() + "일 전";
-        } else if (dur.getStandardHours() > 0) {
-            return dur.getStandardHours() + "시간 전";
-        } else if (dur.getStandardMinutes() > 0) {
-            return dur.getStandardMinutes() + "분 전";
-        } else if (dur.getStandardSeconds() > 0) {
-            return dur.getStandardSeconds() + "초 전";
-        } else {
-            return "방금 전";
-        }
+    
+    public Duration ago(){
+        return JodaDateUtil.ago(this.date);
     }
 
     public String authorName() {

dec2d91

cff6e85

app/models/Post.java

--- app/models/Post.java

+++ app/models/Post.java


         return JodaDateUtil.ago(this.date);
     }
 
-    public String calcPassTime() {
-        Duration dur = JodaDateUtil.ago(this.date);
-        if (dur.getStandardDays() > 0) {
-            return dur.getStandardDays() + "일 전";
-        } else if (dur.getStandardHours() > 0) {
-            return dur.getStandardHours() + "시간 전";
-        } else if (dur.getStandardMinutes() > 0) {
-            return dur.getStandardMinutes() + "분 전";
-        } else if (dur.getStandardSeconds() > 0) {
-            return dur.getStandardSeconds() + "초 전";
-        } else {
-            return "방금 전";
-        }
-    }
-
     public static void edit(Post post) {
         Post beforePost = findById(post.id);
         post.commentCount = beforePost.commentCount;

dec2d91

cff6e85

app/views/agoString.scala.html

--- app/views/agoString.scala.html

+++ app/views/agoString.scala.html


 @(duration:org.joda.time.Duration)
 
 @if(duration.getStandardDays() > 0) {
-    @duration.getStandardDays() 일 전
+    @duration.getStandardDays() @Messages("time.day")
 } else {@if(duration.getStandardHours() > 0){
-    @duration.getStandardHours() 시간전
+    @duration.getStandardHours() @Messages("time.hour")
 } else {@if(duration.getStandardMinutes() > 0) {
-    @duration.getStandardMinutes() 분전
+    @duration.getStandardMinutes() @Messages("time.minute")
 } else {@if(duration.getStandardSeconds() > 0) {
-    @duration.getStandardSeconds 초전
+    @duration.getStandardSeconds @Messages("time.second")
 } else {
-    방금전
+    @Messages("time.just")
 }}}}
 
 

dec2d91

cff6e85

app/views/board/editPost.scala.html

--- app/views/board/editPost.scala.html

+++ app/views/board/editPost.scala.html


 @implicitFieldConstructor = @{ helper.FieldConstructor(twitterBootstrapInput.render) } 
 
 @main(title, project) {
-    @helper.form(action=routes.BoardApp.updatePost(project.name, postId), 'enctype -> "multipart/form-data"){
+    @helper.form(action=routes.BoardApp.updatePost(project.owner, project.name, postId), 'enctype -> "multipart/form-data"){
     	@helper.inputText(form("title"), '_showConstraints -> false, '_label-> "제목")
     	@helper.textarea(form("contents"), '_showConstraints -> false, '_label->"내용")
     	@helper.inputFile(form("filePath"))

dec2d91

cff6e85

app/views/board/newPost.scala.html

--- app/views/board/newPost.scala.html

+++ app/views/board/newPost.scala.html


 @implicitFieldConstructor = @{ helper.FieldConstructor(twitterBootstrapInput.render) } 
 
 @main(title, project) {
-    @helper.form(action=routes.BoardApp.savePost(project.name), 'enctype -> "multipart/form-data"){
+    @helper.form(action=routes.BoardApp.savePost(project.owner, project.name), 'enctype -> "multipart/form-data"){
     	@helper.inputText(form("title"), '_showConstraints -> false, '_label-> "제목")
     	@helper.textarea(form("contents"), '_showConstraints -> false, '_label->"내용")
     	@helper.inputFile(form("filePath"))

dec2d91

cff6e85

app/views/board/notExsitPage.scala.html

--- app/views/board/notExsitPage.scala.html

+++ app/views/board/notExsitPage.scala.html


 
 @main(title, project) {
     <h1>존재하지 않는 게시물 입니다.</h1>
-    <a href="@routes.BoardApp.posts(project.name)" class="btn">목록으로 가기</a>
+    <a href="@routes.BoardApp.posts(project.owner, project.name)" class="btn">목록으로 가기</a>
 }

dec2d91

cff6e85

app/views/board/post.scala.html

--- app/views/board/post.scala.html

+++ app/views/board/post.scala.html


 <div class="row">
     <div class="span2 offset10">
 	    <div id="board_btn_panel">
-	        <a class="btn btn-primary" href="@routes.BoardApp.editPost(project.name, post.id)">수정</a>
+	        <a class="btn btn-primary" href="@routes.BoardApp.editPost(project.owner, project.name, post.id)">수정</a>
 	        <a data-toggle="modal" href="#deleteConfirm" class="btn">삭제</a>
-	        <a class="btn" href="@routes.BoardApp.posts(project.name)">목록</a>
+	        <a class="btn" href="@routes.BoardApp.posts(project.owner, project.name)">목록</a>
 	    </div>
 	</div>
 </div>

 		<div class="span11">
 			<h1>@post.title</h1>
 			<div>
-				<span>@post.authorName가 @post.calcPassTime()에 작성함<span> |
+				<span>@post.authorName가 @agoString(post.ago())에 작성함<span> |
 				<span>@post.date</span>
 			</div>
 		</div>

 	<div class="span1"><img class="pull-right" src="http://placehold.it/50x50"/></div>
 	<div class="span11">
 		<div>
-			<span>@comment.authorName가 @comment.calcPassTime()에 작성함</span> |
+			<span>@comment.authorName가 @agoString(comment.ago())에 작성함</span> |
 			<span>@comment.date</span>
 		</div>
 		<p>@comment.contents<p>

 <!-- 댓글 입력 폼 -->
 <hr/>
 <div class="row">
-	@helper.form(routes.BoardApp.saveComment(project.name, post.id), 'enctype -> "multipart/form-data"){
+	@helper.form(routes.BoardApp.saveComment(project.owner, project.name, post.id), 'enctype -> "multipart/form-data"){
 		<div class="span12">@helper.textarea(commentForm("contents"), '_showConstraints -> false, 'label-> "덧글내용")</div>
 		<div class="span6">@helper.inputFile(commentForm("filePath"), '_showConstraints -> false, 'label->"파일첨부")</div>		
 		<div class="span6"><input class="btn pull-right" type="submit" value="댓글입력"/></div>

     <p>그래도 삭제하시겠습니까?</p>
   </div>
   <div class="modal-footer">
-    <a class="btn btn-primary" href="@routes.BoardApp.deletePost(project.name, post.id)">예</a>
+    <a class="btn btn-primary" href="@routes.BoardApp.deletePost(project.owner, project.name, post.id)">예</a>
     <a href="#" class="btn" data-dismiss="modal">아니오</a>
   </div>
 </div>

dec2d91

cff6e85

app/views/board/postList.scala.html

--- app/views/board/postList.scala.html

+++ app/views/board/postList.scala.html


 
 @header(label:String, key:String) = {
     <th>
-        <a key="@key" href="@routes.BoardApp.posts(project.name)">@label</a>
+        <a key="@key" href="@routes.BoardApp.posts(project.owner, project.name)">@label</a>
         @if(key == param.key){
         @if(param.order == "desc"){
         <i class="icon-chevron-down"></i>

           <input type="hidden" name="pageNum" value="@param.pageNum">
           <input type="text" name="filter" class="search-query">
           <button type="submit" class="btn"><i class="icon-search"></i></button>
-          <a class="btn btn-primary" href="@routes.BoardApp.newPost(project.name)" >새글</a>
+          <a class="btn btn-primary" href="@routes.BoardApp.newPost(project.owner, project.name)" >새글</a>
         </form>
       </div>    
     </div>  

 	    		@for(post <- page.getList()){
 	    		<tr>
 	    			<td>@post.id</td>
-	    			<td><a href="@routes.BoardApp.post(project.name, post.id)">@post.title [@post.commentCount]</a></td>
+	    			<td><a href="@routes.BoardApp.post(project.owner, project.name, post.id)">@post.title [@post.commentCount]</a></td>
 	    			<td>@post.authorName</td>
-	    			<td>@post.calcPassTime() @agoString(post.ago())</td>
+	    			<td>@agoString(post.ago())</td>
 	    		</tr>
 	    		}
 	    	</tbody>

dec2d91

cff6e85

app/views/topmenu.scala.html

--- app/views/topmenu.scala.html

+++ app/views/topmenu.scala.html


       <a href="@routes.ProjectApp.project(project.owner, project.name)">@Messages("menu.home")</a>
     </li>
     @roleCheck(session.get("userId"), project.id, models.enumeration.PermissionResource.BOARD, models.enumeration.PermissionOperation.READ){
-        <li class="@isActiveMenu(routes.BoardApp.posts(project.name))">
-          <a href="@routes.BoardApp.posts(project.name)">@Messages("menu.board")</a>
+        <li class="@isActiveMenu(routes.BoardApp.posts(project.owner, project.name))">
+          <a href="@routes.BoardApp.posts(project.owner, project.name)">@Messages("menu.board")</a>
         </li>
     }
     @roleCheck(session.get("userId"), project.id, models.enumeration.PermissionResource.CODE, models.enumeration.PermissionOperation.READ){

dec2d91

cff6e85

conf/messages.en

--- conf/messages.en

+++ conf/messages.en

...	...	@@ -179,4 +179,11 @@
179	179	user.email = E-mail
180	180	user.wrongEmail.alert = Wrong email address.
181	181	user.login.failed = Your login ID or password is not valid.
182		-user.logout.success = Logout successfully (No newline at end of file)
	182	+user.logout.success = Logout successfully
	183	+
	184	+#Time
	185	+time.just = just now
	186	+time.second = second ago
	187	+time.minute = minute ago
	188	+time.hour = hour ago
	189	+time.day = day ago (No newline at end of file)

dec2d91

cff6e85

conf/messages.ko

--- conf/messages.ko

+++ conf/messages.ko

...	...	@@ -178,4 +178,11 @@
178	178	user.email = 이메일
179	179	user.wrongEmail.alert = 이메일이 잘못되었습니다.
180	180	user.login.failed = 아이디 또는 비밀번호가 잘못되었습니다.
181		-user.logout.success = 성공적으로 로그아웃되었습니다. (No newline at end of file)
	181	+user.logout.success = 성공적으로 로그아웃되었습니다.
	182	+
	183	+#Time
	184	+time.just = 방금 전
	185	+time.second = 초 전
	186	+time.minute = 분 전
	187	+time.hour = 시간 전
	188	+time.day = 일 전 (No newline at end of file)

dec2d91

cff6e85

conf/routes

--- conf/routes

+++ conf/routes


 GET     /sites/softwareMap                  controllers.SiteApp.softwareMap()
 
 # Boards
-GET     /:projectName/boardList                 controllers.BoardApp.posts(projectName:String)
-GET     /:projectName/boards/new                controllers.BoardApp.newPost(projectName:String)
-POST    /:projectName/boards/new                controllers.BoardApp.savePost(projectName:String)
-GET     /:projectName/board/:id                 controllers.BoardApp.post(projectName:String, id:Long)
-POST    /:projectName/board/:id/replay          controllers.BoardApp.saveComment(projectName:String, id:Long)
-GET     /:projectName/board/:id/delete          controllers.BoardApp.deletePost(projectName:String, id:Long)
-GET     /:projectName/board/:id/edit            controllers.BoardApp.editPost(projectName:String, id:Long)
-POST    /:projectName/board/:id/edit            controllers.BoardApp.updatePost(projectName:String, id:Long)
+GET     /:ownerName/:projectName/boardList                 controllers.BoardApp.posts(ownerName:String, projectName:String)
+GET     /:ownerName/:projectName/boards/new                controllers.BoardApp.newPost(ownerName:String, projectName:String)
+POST    /:ownerName/:projectName/boards/new                controllers.BoardApp.savePost(ownerName:String, projectName:String)
+GET     /:ownerName/:projectName/board/:id                 controllers.BoardApp.post(ownerName:String, projectName:String, id:Long)
+POST    /:ownerName/:projectName/board/:id/replay          controllers.BoardApp.saveComment(ownerName:String, projectName:String, id:Long)
+GET     /:ownerName/:projectName/board/:id/delete          controllers.BoardApp.deletePost(ownerName:String, projectName:String, id:Long)
+GET     /:ownerName/:projectName/board/:id/edit            controllers.BoardApp.editPost(ownerName:String, projectName:String, id:Long)
+POST    /:ownerName/:projectName/board/:id/edit            controllers.BoardApp.updatePost(ownerName:String, projectName:String, id:Long)
 
 # Projects
 GET     /projects/new                           controllers.ProjectApp.newProject()

Add a comment

Open 0
Closed 0

List

...	...	@@ -24,28 +24,29 @@
24	24
25	25	public class BoardApp extends Controller {
26	26
27		- public static Result posts(String projectName) {
	27	+ public static Result posts(String ownerName, String projectName) {
28	28
29	29	Form<Post.Param> postParamForm = new Form<Post.Param>(Post.Param.class);
30	30	Param postParam = postParamForm.bindFromRequest().get();
31		- Project project = Project.findByName(projectName);
	31	+ Project project = Project.findByNameAndOwner(ownerName, projectName);
	32	+
32	33
33	34	return ok(postList.render("게시판", project,
34	35	Post.findOnePage(project.name, postParam.pageNum, Direction.getValue(postParam.order), postParam.key),
35	36	postParam));
36	37	}
37	38
38		- public static Result newPost(String projectName) {
39		- Project project = Project.findByName(projectName);
	39	+ public static Result newPost(String ownerName, String projectName) {
	40	+ Project project = Project.findByNameAndOwner(ownerName, projectName);
40	41	return ok(newPost.render("새 게시물", new Form<Post>(Post.class), project));
41	42	}
42	43
43		- public static Result savePost(String projectName) {
	44	+ public static Result savePost(String ownerName, String projectName) {
44	45	Form<Post> postForm = new Form<Post>(Post.class).bindFromRequest();
45		- Project project = Project.findByName(projectName);
	46	+ Project project = Project.findByNameAndOwner(ownerName, projectName);
46	47	if (postForm.hasErrors()) {
47	48	return ok(boardError.render("본문과 제목은 반드시 써야합니다.",
48		- routes.BoardApp.newPost(project.name), project));
	49	+ routes.BoardApp.newPost(project.owner, project.name), project));
49	50	} else {
50	51	Post post = postForm.get();
51	52	post.authorId = UserApp.currentUser().id;
...	...	@@ -55,12 +56,12 @@
55	56	Post.write(post);
56	57	}
57	58
58		- return redirect(routes.BoardApp.posts(project.name));
	59	+ return redirect(routes.BoardApp.posts(project.owner, project.name));
59	60	}
60	61
61		- public static Result post(String projectName, Long postId) {
	62	+ public static Result post(String ownerName, String projectName, Long postId) {
62	63	Post post = Post.findById(postId);
63		- Project project = Project.findByName(projectName);
	64	+ Project project = Project.findByNameAndOwner(ownerName, projectName);
64	65	if (post == null) {
65	66	return ok(notExsitPage.render("존재하지 않는 게시물", project));
66	67	} else {
...	...	@@ -69,13 +70,13 @@
69	70	}
70	71	}
71	72
72		- public static Result saveComment(String projectName, Long postId) {
	73	+ public static Result saveComment(String ownerName, String projectName, Long postId) {
73	74	Form<Comment> commentForm = new Form<Comment>(Comment.class).bindFromRequest();
74	75
75		- Project project = Project.findByName(projectName);
	76	+ Project project = Project.findByNameAndOwner(ownerName, projectName);
76	77	if (commentForm.hasErrors()) {
77	78	return ok(boardError.render("본문은 반드시 쓰셔야 합니다.",
78		- routes.BoardApp.post(project.name, postId), project));
	79	+ routes.BoardApp.post(project.owner, project.name, postId), project));
79	80
80	81	} else {
81	82	Comment comment = commentForm.get();
...	...	@@ -86,32 +87,32 @@
86	87	Comment.write(comment);
87	88	Post.countUpCommentCounter(postId);
88	89
89		- return redirect(routes.BoardApp.post(project.name, postId));
	90	+ return redirect(routes.BoardApp.post(project.owner, project.name, postId));
90	91	}
91	92	}
92	93
93		- public static Result deletePost(String projectName, Long postId) {
94		- Project project = Project.findByName(projectName);
	94	+ public static Result deletePost(String ownerName, String projectName, Long postId) {
	95	+ Project project = Project.findByNameAndOwner(ownerName, projectName);
95	96	Post.delete(postId);
96		- return redirect(routes.BoardApp.posts(project.name));
	97	+ return redirect(routes.BoardApp.posts(project.owner, project.name));
97	98	}
98	99
99		- public static Result editPost(String projectName, Long postId) {
	100	+ public static Result editPost(String ownerName, String projectName, Long postId) {
100	101	Post existPost = Post.findById(postId);
101	102	Form<Post> editForm = new Form<Post>(Post.class).fill(existPost);
102		- Project project = Project.findByName(projectName);
	103	+ Project project = Project.findByNameAndOwner(ownerName, projectName);
103	104
104	105	if (UserApp.currentUser().id == existPost.authorId) {
105	106	return ok(editPost.render("게시물 수정", editForm, postId, project));
106	107	} else {
107		- return ok(boardError.render("글쓴이가 아닙니다.", routes.BoardApp.post(project.name, postId),
	108	+ return ok(boardError.render("글쓴이가 아닙니다.", routes.BoardApp.post(project.owner, project.name, postId),
108	109	project));
109	110	}
110	111	}
111	112
112		- public static Result updatePost(String projectName, Long postId) {
	113	+ public static Result updatePost(String ownerName, String projectName, Long postId) {
113	114	Form<Post> postForm = new Form<Post>(Post.class).bindFromRequest();
114		- Project projcet = Project.findByName(projectName);
	115	+ Project project = Project.findByNameAndOwner(ownerName, projectName);
115	116
116	117	if (postForm.hasErrors()) {
117	118	return ok("입력값이 잘못되었습니다.");
...	...	@@ -121,12 +122,12 @@
121	122	post.authorId = UserApp.currentUser().id;
122	123	post.id = postId;
123	124	post.filePath = saveFile(request());
124		- post.project = projcet;
	125	+ post.project = project;
125	126
126	127	Post.edit(post);
127	128	}
128	129
129		- return redirect(routes.BoardApp.posts(projcet.name));
	130	+ return redirect(routes.BoardApp.posts(project.owner, project.name));
130	131	}
131	132
132	133	private static String saveFile(Request request) {

...	...	@@ -14,6 +14,7 @@
14	14	public class CodeApp extends Controller {
15	15
16	16	public static Result view(String ownerName, String projectName, String path) throws IOException {
	17	+ //FIXME use ownerName
17	18	String vcs = Project.findByName(projectName).vcs;
18	19	if (vcs.equals("GIT")) {
19	20	return GitApp.viewCode(projectName, path);
...	...	@@ -24,6 +25,7 @@
24	25
25	26	public static Result ajaxRequest(String ownerName, String projectName, String path) throws IOException, NoHeadException, GitAPIException {
26	27	try {
	28	+ //FIXME use ownerName
27	29	return ok(new GitRepository(projectName).findFileInfo(path));
28	30	} catch (NoHeadException e) {
29	31	return forbidden();

...	...	@@ -101,21 +101,6 @@
101	101	return JodaDateUtil.ago(this.date);
102	102	}
103	103
104		- public String calcPassTime() {
105		- Duration dur = JodaDateUtil.ago(this.date);
106		- if (dur.getStandardDays() > 0) {
107		- return dur.getStandardDays() + "일 전";
108		- } else if (dur.getStandardHours() > 0) {
109		- return dur.getStandardHours() + "시간 전";
110		- } else if (dur.getStandardMinutes() > 0) {
111		- return dur.getStandardMinutes() + "분 전";
112		- } else if (dur.getStandardSeconds() > 0) {
113		- return dur.getStandardSeconds() + "초 전";
114		- } else {
115		- return "방금 전";
116		- }
117		- }
118		-
119	104	public static void edit(Post post) {
120	105	Post beforePost = findById(post.id);
121	106	post.commentCount = beforePost.commentCount;

...	...	@@ -24,14 +24,14 @@
24	24	GET /sites/softwareMap controllers.SiteApp.softwareMap()
25	25
26	26	# Boards
27		-GET /:projectName/boardList controllers.BoardApp.posts(projectName:String)
28		-GET /:projectName/boards/new controllers.BoardApp.newPost(projectName:String)
29		-POST /:projectName/boards/new controllers.BoardApp.savePost(projectName:String)
30		-GET /:projectName/board/:id controllers.BoardApp.post(projectName:String, id:Long)
31		-POST /:projectName/board/:id/replay controllers.BoardApp.saveComment(projectName:String, id:Long)
32		-GET /:projectName/board/:id/delete controllers.BoardApp.deletePost(projectName:String, id:Long)
33		-GET /:projectName/board/:id/edit controllers.BoardApp.editPost(projectName:String, id:Long)
34		-POST /:projectName/board/:id/edit controllers.BoardApp.updatePost(projectName:String, id:Long)
	27	+GET /:ownerName/:projectName/boardList controllers.BoardApp.posts(ownerName:String, projectName:String)
	28	+GET /:ownerName/:projectName/boards/new controllers.BoardApp.newPost(ownerName:String, projectName:String)
	29	+POST /:ownerName/:projectName/boards/new controllers.BoardApp.savePost(ownerName:String, projectName:String)
	30	+GET /:ownerName/:projectName/board/:id controllers.BoardApp.post(ownerName:String, projectName:String, id:Long)
	31	+POST /:ownerName/:projectName/board/:id/replay controllers.BoardApp.saveComment(ownerName:String, projectName:String, id:Long)
	32	+GET /:ownerName/:projectName/board/:id/delete controllers.BoardApp.deletePost(ownerName:String, projectName:String, id:Long)
	33	+GET /:ownerName/:projectName/board/:id/edit controllers.BoardApp.editPost(ownerName:String, projectName:String, id:Long)
	34	+POST /:ownerName/:projectName/board/:id/edit controllers.BoardApp.updatePost(ownerName:String, projectName:String, id:Long)
35	35
36	36	# Projects
37	37	GET /projects/new controllers.ProjectApp.newProject()

...	...	@@ -1,15 +1,14 @@
1	1	package models;
2	2
	3	+import java.util.*;
	4	+
	5	+import javax.persistence.*;
	6	+
3	7	import org.joda.time.Duration;
	8	+
4	9	import play.data.validation.Constraints;
5	10	import play.db.ebean.Model;
6	11	import utils.JodaDateUtil;
7		-
8		-import javax.persistence.Entity;
9		-import javax.persistence.Id;
10		-import javax.persistence.ManyToOne;
11		-import java.util.Date;
12		-import java.util.List;
13	12
14	13	@Entity
15	14	public class Comment extends Model {
...	...	@@ -46,20 +45,9 @@
46	45	public static List<Comment> findCommentsByPostId(Long postId) {
47	46	return find.where().eq("post.id", postId).findList();
48	47	}
49		-
50		- public String calcPassTime() {
51		- Duration dur = JodaDateUtil.ago(this.date);
52		- if (dur.getStandardDays() > 0) {
53		- return dur.getStandardDays() + "일 전";
54		- } else if (dur.getStandardHours() > 0) {
55		- return dur.getStandardHours() + "시간 전";
56		- } else if (dur.getStandardMinutes() > 0) {
57		- return dur.getStandardMinutes() + "분 전";
58		- } else if (dur.getStandardSeconds() > 0) {
59		- return dur.getStandardSeconds() + "초 전";
60		- } else {
61		- return "방금 전";
62		- }
	48	+
	49	+ public Duration ago(){
	50	+ return JodaDateUtil.ago(this.date);
63	51	}
64	52
65	53	public String authorName() {

...	...	@@ -1,15 +1,15 @@
1	1	@(duration:org.joda.time.Duration)
2	2
3	3	@if(duration.getStandardDays() > 0) {
4		- @duration.getStandardDays() 일 전
	4	+ @duration.getStandardDays() @Messages("time.day")
5	5	} else {@if(duration.getStandardHours() > 0){
6		- @duration.getStandardHours() 시간전
	6	+ @duration.getStandardHours() @Messages("time.hour")
7	7	} else {@if(duration.getStandardMinutes() > 0) {
8		- @duration.getStandardMinutes() 분전
	8	+ @duration.getStandardMinutes() @Messages("time.minute")
9	9	} else {@if(duration.getStandardSeconds() > 0) {
10		- @duration.getStandardSeconds 초전
	10	+ @duration.getStandardSeconds @Messages("time.second")
11	11	} else {
12		- 방금전
	12	+ @Messages("time.just")
13	13	}}}}
14	14
15	15

...	...	@@ -4,7 +4,7 @@
4	4	@implicitFieldConstructor = @{ helper.FieldConstructor(twitterBootstrapInput.render) }
5	5
6	6	@main(title, project) {
7		- @helper.form(action=routes.BoardApp.updatePost(project.name, postId), 'enctype -> "multipart/form-data"){
	7	+ @helper.form(action=routes.BoardApp.updatePost(project.owner, project.name, postId), 'enctype -> "multipart/form-data"){
8	8	@helper.inputText(form("title"), '_showConstraints -> false, '_label-> "제목")
9	9	@helper.textarea(form("contents"), '_showConstraints -> false, '_label->"내용")
10	10	@helper.inputFile(form("filePath"))

...	...	@@ -4,5 +4,5 @@
4	4
5	5	@main(title, project) {
6	6	<h1>존재하지 않는 게시물 입니다.</h1>
7		- <a href="@routes.BoardApp.posts(project.name)" class="btn">목록으로 가기</a>
	7	+ <a href="@routes.BoardApp.posts(project.owner, project.name)" class="btn">목록으로 가기</a>
8	8	} (No newline at end of file)

...	...	@@ -4,9 +4,9 @@
4	4	<div class="row">
5	5	<div class="span2 offset10">
6	6	<div id="board_btn_panel">
7		- <a class="btn btn-primary" href="@routes.BoardApp.editPost(project.name, post.id)">수정</a>
	7	+ <a class="btn btn-primary" href="@routes.BoardApp.editPost(project.owner, project.name, post.id)">수정</a>
8	8	<a data-toggle="modal" href="#deleteConfirm" class="btn">삭제</a>
9		- <a class="btn" href="@routes.BoardApp.posts(project.name)">목록</a>
	9	+ <a class="btn" href="@routes.BoardApp.posts(project.owner, project.name)">목록</a>
10	10	</div>
11	11	</div>
12	12	</div>
...	...	@@ -17,7 +17,7 @@
17	17	<div class="span11">
18	18	<h1>@post.title</h1>
19	19	<div>
20		- <span>@post.authorName가 @post.calcPassTime()에 작성함<span> \|
	20	+ <span>@post.authorName가 @agoString(post.ago())에 작성함<span> \|
21	21	<span>@post.date</span>
22	22	</div>
23	23	</div>
...	...	@@ -42,7 +42,7 @@
42	42	<div class="span1"><img class="pull-right" src="http://placehold.it/50x50"/></div>
43	43	<div class="span11">
44	44	<div>
45		- <span>@comment.authorName가 @comment.calcPassTime()에 작성함</span> \|
	45	+ <span>@comment.authorName가 @agoString(comment.ago())에 작성함</span> \|
46	46	<span>@comment.date</span>
47	47	</div>
48	48	<p>@comment.contents<p>
...	...	@@ -55,7 +55,7 @@
55	55	<!-- 댓글 입력 폼 -->
56	56	<hr/>
57	57	<div class="row">
58		- @helper.form(routes.BoardApp.saveComment(project.name, post.id), 'enctype -> "multipart/form-data"){
	58	+ @helper.form(routes.BoardApp.saveComment(project.owner, project.name, post.id), 'enctype -> "multipart/form-data"){
59	59	<div class="span12">@helper.textarea(commentForm("contents"), '_showConstraints -> false, 'label-> "덧글내용")</div>
60	60	<div class="span6">@helper.inputFile(commentForm("filePath"), '_showConstraints -> false, 'label->"파일첨부")</div>
61	61	<div class="span6"><input class="btn pull-right" type="submit" value="댓글입력"/></div>
...	...	@@ -81,7 +81,7 @@
81	81	<p>그래도 삭제하시겠습니까?</p>
82	82	</div>
83	83	<div class="modal-footer">
84		- <a class="btn btn-primary" href="@routes.BoardApp.deletePost(project.name, post.id)">예</a>
	84	+ <a class="btn btn-primary" href="@routes.BoardApp.deletePost(project.owner, project.name, post.id)">예</a>
85	85	<a href="#" class="btn" data-dismiss="modal">아니오</a>
86	86	</div>
87	87	</div>

...	...	@@ -2,7 +2,7 @@
2	2
3	3	@header(label:String, key:String) = {
4	4	<th>
5		- <a key="@key" href="@routes.BoardApp.posts(project.name)">@label</a>
	5	+ <a key="@key" href="@routes.BoardApp.posts(project.owner, project.name)">@label</a>
6	6	@if(key == param.key){
7	7	@if(param.order == "desc"){
8	8	<i class="icon-chevron-down"></i>
...	...	@@ -23,7 +23,7 @@
23	23	<input type="hidden" name="pageNum" value="@param.pageNum">
24	24	<input type="text" name="filter" class="search-query">
25	25	<button type="submit" class="btn"><i class="icon-search"></i></button>
26		- <a class="btn btn-primary" href="@routes.BoardApp.newPost(project.name)" >새글</a>
	26	+ <a class="btn btn-primary" href="@routes.BoardApp.newPost(project.owner, project.name)" >새글</a>
27	27	</form>
28	28	</div>
29	29	</div>
...	...	@@ -52,9 +52,9 @@
52	52	@for(post <- page.getList()){
53	53	<tr>
54	54	<td>@post.id</td>
55		- <td><a href="@routes.BoardApp.post(project.name, post.id)">@post.title [@post.commentCount]</a></td>
	55	+ <td><a href="@routes.BoardApp.post(project.owner, project.name, post.id)">@post.title [@post.commentCount]</a></td>
56	56	<td>@post.authorName</td>
57		- <td>@post.calcPassTime() @agoString(post.ago())</td>
	57	+ <td>@agoString(post.ago())</td>
58	58	</tr>
59	59	}
60	60	</tbody>

...	...	@@ -7,8 +7,8 @@
7	7	<a href="@routes.ProjectApp.project(project.owner, project.name)">@Messages("menu.home")</a>
8	8	</li>
9	9	@roleCheck(session.get("userId"), project.id, models.enumeration.PermissionResource.BOARD, models.enumeration.PermissionOperation.READ){
10		- <li class="@isActiveMenu(routes.BoardApp.posts(project.name))">
11		- <a href="@routes.BoardApp.posts(project.name)">@Messages("menu.board")</a>
	10	+ <li class="@isActiveMenu(routes.BoardApp.posts(project.owner, project.name))">
	11	+ <a href="@routes.BoardApp.posts(project.owner, project.name)">@Messages("menu.board")</a>
12	12	</li>
13	13	}
14	14	@roleCheck(session.get("userId"), project.id, models.enumeration.PermissionResource.CODE, models.enumeration.PermissionOperation.READ){

Delete comment