Commit @88469590eb60eba4ef38270a9b3a2b4e99014ef6

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

Keesun Baik 2013-04-18

only manager and site manager can see the project settings menu

@88469590eb60eba4ef38270a9b3a2b4e99014ef6

54d1fd3

8846959

app/models/ProjectUser.java

--- app/models/ProjectUser.java

+++ app/models/ProjectUser.java

...	...	@@ -174,4 +174,41 @@
174	174	}
175	175	return false;
176	176	}
	177	+
	178	+ public static String roleOf(String loginId, Project project) {
	179	+ String roleName = "guest";
	180	+ if(loginId == null) {
	181	+ return roleName;
	182	+ }
	183	+
	184	+ User user = User.findByLoginId(loginId);
	185	+ if(user == null) {
	186	+ return roleName;
	187	+ }
	188	+
	189	+ if(user.isSiteManager()) {
	190	+ return "siteManager";
	191	+ } else if(!user.isAnonymous()) {
	192	+ Role role = Role.findRoleByIds(user.id, project.id);
	193	+ if(role != null) {
	194	+ return role.name.toLowerCase();
	195	+ }
	196	+ }
	197	+ return roleName;
	198	+ }
	199	+
	200	+ public static boolean isAllowedToSettings(String loginId, Project project) {
	201	+ if(loginId == null) {
	202	+ return false;
	203	+ }
	204	+
	205	+ User user = User.findByLoginId(loginId);
	206	+ if(user == null \|\| user.isAnonymous()) {
	207	+ return false;
	208	+ }
	209	+ if(user.isSiteManager() \|\| ProjectUser.isManager(user.id, project.id)) {
	210	+ return true;
	211	+ }
	212	+ return false;
	213	+ }
177	214	}

54d1fd3

8846959

app/views/prjmenu.scala.html

--- app/views/prjmenu.scala.html

+++ app/views/prjmenu.scala.html


     menuState
 }
 
-<div class="label user-role">
-	<i class="icon-eye-open icon-white"></i>
-     @{
-         var role = "guest"; // anonymous
-         val loginId = session.contains("loginId")
-         if(loginId) {
-             var currentUser = User.findByLoginId(session.get("loginId"))
-             if(currentUser.isSiteManager) {
-                 role = "siteManager"
-             } else if(!currentUser.isAnonymous) {
-                 val roleOfProject = Role.findRoleByIds(currentUser.id, project.id)
-                 if(roleOfProject != null) {
-                     role = roleOfProject.name;
-                 }
-             }
-        }
-		Messages("role." + role)
-     }
+<div class="label inline-block" style="border-radius:3px 3px 0px 0px; padding:5px 10px;">
+	<i class="icon-eye-open icon-white" style="vertical-align:bottom;"></i>
+     @Messages("role." + ProjectUser.roleOf(session.get("loginId"), project))
 </div>
 
 <div class="project-menu @menuCSS">

 $(document).ready(function(){
 	try {
 		var welLink;
-		
+
 		$(".project-menu-wrap a").each(function(n, el){
 			welLink = $(el);
 			if(welLink.attr("href") == document.location.pathname){

54d1fd3

8846959

app/views/sidemenu.scala.html

--- app/views/sidemenu.scala.html

+++ app/views/sidemenu.scala.html


 @(project:Project)
 
+@if(ProjectUser.isAllowedToSettings(session.get("loginId"), project)) {
 <div class="side-menu-wrap">
     <ul class="side-menus unstyled bg">
-    	<!-- 
+	<!--
         <li class="side-menu"><a href="@routes.StatisticsApp.statistics(project.owner, project.name)"><i class="ico ico-statistics"></i></a></li>
         -->
         <li class="side-menu"><a href="@routes.ProjectApp.settingForm(project.owner, project.name)"><i class="ico ico-setting"></i></a></li>
     </ul>
-</div>
+</div>
+}

54d1fd3

8846959

test/models/ProjectUserTest.java

--- test/models/ProjectUserTest.java

+++ test/models/ProjectUserTest.java


         assertThat(ProjectUser.findByIds(2l, 3l).role.id)
                 .isEqualTo(2l);
     }
-    
+
     @Test
     public void assignRole() throws Exception {
         // Given

         assertThat(ProjectUser.findByIds(2l, 1l).role.id).isEqualTo(2l);
         assertThat(ProjectUser.findByIds(2l, 3l).role.id).isEqualTo(2l);
     }
-    
+
     @Test
     public void isManager() throws Exception {
         // Given

         assertThat(ProjectUser.checkOneMangerPerOneProject(1l)).isEqualTo(true);
         assertThat(ProjectUser.checkOneMangerPerOneProject(3l)).isEqualTo(true);
     }
-    
+
     @Test
     public void isMember() throws Exception {
         // Given

         assertThat(ProjectUser.isMember(2l, 2l)).isEqualTo(true);
         assertThat(ProjectUser.isMember(2l, 3l)).isEqualTo(false);
     }
-    
+
     @Test
     public void options() throws Exception {
         // Given

         // Then
         assertThat(ProjectUser.options(1l).containsValue("k16wire")).isEqualTo(true);
     }
-    
+
     @Test
     public void findMemberListByProject() throws Exception {
         // Given

         assertThat(projectUsers.get(0).user.loginId).isEqualTo("hobi");
         assertThat(projectUsers.get(0).role.name).isEqualTo("manager");
     }
+
+    @Test
+    public void roleOf() {
+        // GIVEN
+        String loginId = "hobi";
+        Project project = Project.findByNameAndOwner(loginId, "nForge4java");
+        // WHEN
+        String roleName = ProjectUser.roleOf(loginId, project);
+        // THEN
+        assertThat(roleName).isEqualTo("manager");
+
+        // WHEN
+        roleName = ProjectUser.roleOf("admin", project);
+        // THEN
+        assertThat(roleName).isEqualTo("siteManager");
+
+        // WHEN
+        roleName = ProjectUser.roleOf(null, project);
+        // THEN
+        assertThat(roleName).isEqualTo("guest");
+
+        // WHEN
+        roleName = ProjectUser.roleOf("keesun", project);
+        // THEN
+        assertThat(roleName).isEqualTo("guest");
+    }
+
+    @Test
+    public void isAllowedToSettings() {
+        // GIVEN
+        String loginId = "hobi";
+        Project project = Project.findByNameAndOwner(loginId, "nForge4java");
+        // WHEN // THEN
+        assertThat(ProjectUser.isAllowedToSettings(loginId, project)).isTrue();
+        // WHEN // THEN
+        assertThat(ProjectUser.isAllowedToSettings("admin", project)).isTrue();
+        // WHEN // THEN
+        assertThat(ProjectUser.isAllowedToSettings(null, project)).isFalse();
+        // WHEN // THEN
+        assertThat(ProjectUser.isAllowedToSettings("keesun", project)).isFalse();
+
+    }
 }

Add a comment

Open 0
Closed 0

List

...	...	@@ -22,24 +22,9 @@
22	22	menuState
23	23	}
24	24
25		-<div class="label user-role">
26		- <i class="icon-eye-open icon-white"></i>
27		- @{
28		- var role = "guest"; // anonymous
29		- val loginId = session.contains("loginId")
30		- if(loginId) {
31		- var currentUser = User.findByLoginId(session.get("loginId"))
32		- if(currentUser.isSiteManager) {
33		- role = "siteManager"
34		- } else if(!currentUser.isAnonymous) {
35		- val roleOfProject = Role.findRoleByIds(currentUser.id, project.id)
36		- if(roleOfProject != null) {
37		- role = roleOfProject.name;
38		- }
39		- }
40		- }
41		- Messages("role." + role)
42		- }
	25	+<div class="label inline-block" style="border-radius:3px 3px 0px 0px; padding:5px 10px;">
	26	+ <i class="icon-eye-open icon-white" style="vertical-align:bottom;"></i>
	27	+ @Messages("role." + ProjectUser.roleOf(session.get("loginId"), project))
43	28	</div>
44	29
45	30	<div class="project-menu @menuCSS">
...	...	@@ -77,7 +62,7 @@
77	62	$(document).ready(function(){
78	63	try {
79	64	var welLink;
80		-
	65	+
81	66	$(".project-menu-wrap a").each(function(n, el){
82	67	welLink = $(el);
83	68	if(welLink.attr("href") == document.location.pathname){

...	...	@@ -1,10 +1,12 @@
1	1	@(project:Project)
2	2
	3	+@if(ProjectUser.isAllowedToSettings(session.get("loginId"), project)) {
3	4	<div class="side-menu-wrap">
4	5	<ul class="side-menus unstyled bg">
5		- <!--
	6	+ <!--
6	7	<li class="side-menu"><a href="@routes.StatisticsApp.statistics(project.owner, project.name)"><i class="ico ico-statistics"></i></a></li>
7	8	-->
8	9	<li class="side-menu"><a href="@routes.ProjectApp.settingForm(project.owner, project.name)"><i class="ico ico-setting"></i></a></li>
9	10	</ul>
10		-</div> (No newline at end of file)
	11	+</div>
	12	+} (No newline at end of file)

...	...	@@ -28,7 +28,7 @@
28	28	assertThat(ProjectUser.findByIds(2l, 3l).role.id)
29	29	.isEqualTo(2l);
30	30	}
31		-
	31	+
32	32	@Test
33	33	public void assignRole() throws Exception {
34	34	// Given
...	...	@@ -40,7 +40,7 @@
40	40	assertThat(ProjectUser.findByIds(2l, 1l).role.id).isEqualTo(2l);
41	41	assertThat(ProjectUser.findByIds(2l, 3l).role.id).isEqualTo(2l);
42	42	}
43		-
	43	+
44	44	@Test
45	45	public void isManager() throws Exception {
46	46	// Given
...	...	@@ -51,7 +51,7 @@
51	51	assertThat(ProjectUser.checkOneMangerPerOneProject(1l)).isEqualTo(true);
52	52	assertThat(ProjectUser.checkOneMangerPerOneProject(3l)).isEqualTo(true);
53	53	}
54		-
	54	+
55	55	@Test
56	56	public void isMember() throws Exception {
57	57	// Given
...	...	@@ -60,7 +60,7 @@
60	60	assertThat(ProjectUser.isMember(2l, 2l)).isEqualTo(true);
61	61	assertThat(ProjectUser.isMember(2l, 3l)).isEqualTo(false);
62	62	}
63		-
	63	+
64	64	@Test
65	65	public void options() throws Exception {
66	66	// Given
...	...	@@ -68,7 +68,7 @@
68	68	// Then
69	69	assertThat(ProjectUser.options(1l).containsValue("k16wire")).isEqualTo(true);
70	70	}
71		-
	71	+
72	72	@Test
73	73	public void findMemberListByProject() throws Exception {
74	74	// Given
...	...	@@ -80,4 +80,46 @@
80	80	assertThat(projectUsers.get(0).user.loginId).isEqualTo("hobi");
81	81	assertThat(projectUsers.get(0).role.name).isEqualTo("manager");
82	82	}
	83	+
	84	+ @Test
	85	+ public void roleOf() {
	86	+ // GIVEN
	87	+ String loginId = "hobi";
	88	+ Project project = Project.findByNameAndOwner(loginId, "nForge4java");
	89	+ // WHEN
	90	+ String roleName = ProjectUser.roleOf(loginId, project);
	91	+ // THEN
	92	+ assertThat(roleName).isEqualTo("manager");
	93	+
	94	+ // WHEN
	95	+ roleName = ProjectUser.roleOf("admin", project);
	96	+ // THEN
	97	+ assertThat(roleName).isEqualTo("siteManager");
	98	+
	99	+ // WHEN
	100	+ roleName = ProjectUser.roleOf(null, project);
	101	+ // THEN
	102	+ assertThat(roleName).isEqualTo("guest");
	103	+
	104	+ // WHEN
	105	+ roleName = ProjectUser.roleOf("keesun", project);
	106	+ // THEN
	107	+ assertThat(roleName).isEqualTo("guest");
	108	+ }
	109	+
	110	+ @Test
	111	+ public void isAllowedToSettings() {
	112	+ // GIVEN
	113	+ String loginId = "hobi";
	114	+ Project project = Project.findByNameAndOwner(loginId, "nForge4java");
	115	+ // WHEN // THEN
	116	+ assertThat(ProjectUser.isAllowedToSettings(loginId, project)).isTrue();
	117	+ // WHEN // THEN
	118	+ assertThat(ProjectUser.isAllowedToSettings("admin", project)).isTrue();
	119	+ // WHEN // THEN
	120	+ assertThat(ProjectUser.isAllowedToSettings(null, project)).isFalse();
	121	+ // WHEN // THEN
	122	+ assertThat(ProjectUser.isAllowedToSettings("keesun", project)).isFalse();
	123	+
	124	+ }
83	125	}

Delete comment