Commit @2fe1ecba6a0a1f17eec66dd996d621db1d800a5e

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

doortts 2018-10-26

usermenu: Change org's project count expression

@2fe1ecba6a0a1f17eec66dd996d621db1d800a5e

7a5bfd5

2fe1ecb

app/views/index/allOrganizationList_partial.scala.html

--- app/views/index/allOrganizationList_partial.scala.html

+++ app/views/index/allOrganizationList_partial.scala.html


 @(organization: Organization, favored:Boolean, isLast:Boolean = false)
 @import utils.TemplateHelper._
 
-@isAllowShowCount() = @{
-    UserApp.currentUser().isSiteManager || UserApp.currentUser().isAdminOf(organization)
-}
-
 @defining(UserApp.currentUser().getFavoriteProjects){ favoriteProjects =>
 <li class="@if(isLast){favored} org-li">
     <div class="org-list project-flex-container all-orgs">

             </div>
             <div class="projectName-owner all-org-names flex-item">
                 <div class="project-name org-name flex-item"><a href="@routes.OrganizationApp.organization(organization.name)" target="_blank">@organization.name</a></div>
-                <div class="project-owner flex-item">@if(isAllowShowCount){@organization.projects.size()}</div>
+                <div class="project-owner flex-item sub-project-counter"></div>
             </div>
         </div>
         <div class="star-org flex-item" data-organization-id="@organization.id">

7a5bfd5

2fe1ecb

app/views/index/myOrganizationList.scala.html

--- app/views/index/myOrganizationList.scala.html

+++ app/views/index/myOrganizationList.scala.html


                             </div>
                             <div class="projectName-owner all-org-names flex-item">
                                 <div class="project-name org-name flex-item">@UserApp.currentUser().loginId</div>
-                                <div class="project-owner flex-item">@ownProjects.size()</div>
+                                <div class="project-owner flex-item sub-project-counter"></div>
                             </div>
                         </div>
                         <div class="star-org flex-item"></div>

7a5bfd5

2fe1ecb

app/views/index/myOwnProjectList_partial.scala.html

--- app/views/index/myOwnProjectList_partial.scala.html

+++ app/views/index/myOwnProjectList_partial.scala.html


             </div>
             <div class="projectName-owner all-org-names flex-item">
                 <div class="project-name org-name flex-item">@UserApp.currentUser().loginId</div>
-                <div class="project-owner flex-item">@ownProjects.size()</div>
+                <div class="project-owner flex-item sub-project-counter"></div>
             </div>
         </div>
         <div class="star-org flex-item">

7a5bfd5

2fe1ecb

public/javascripts/common/yona.Usermenu.js

--- public/javascripts/common/yona.Usermenu.js

+++ public/javascripts/common/yona.Usermenu.js


         $(".all-orgs").on("click", function () {
             var $li = $(this).closest("li").find(".hide").toggle("fast");
         });
+
+        $(".sub-project-counter").each(function (item) {
+            var $this = $(this);
+            var counter = $this.closest(".org-li").find(".project-ul > .user-li").length || "";
+
+            $this.text(counter);
+        });
     }
 });

Add a comment

Open 0
Closed 0

List

...	...	@@ -21,7 +21,7 @@
21	21	</div>
22	22	<div class="projectName-owner all-org-names flex-item">
23	23	<div class="project-name org-name flex-item">@UserApp.currentUser().loginId</div>
24		- <div class="project-owner flex-item">@ownProjects.size()</div>
	24	+ <div class="project-owner flex-item sub-project-counter"></div>
25	25	</div>
26	26	</div>
27	27	<div class="star-org flex-item"></div>

...	...	@@ -213,5 +213,12 @@
213	213	$(".all-orgs").on("click", function () {
214	214	var $li = $(this).closest("li").find(".hide").toggle("fast");
215	215	});
	216	+
	217	+ $(".sub-project-counter").each(function (item) {
	218	+ var $this = $(this);
	219	+ var counter = $this.closest(".org-li").find(".project-ul > .user-li").length \|\| "";
	220	+
	221	+ $this.text(counter);
	222	+ });
216	223	}
217	224	});

...	...	@@ -7,10 +7,6 @@
7	7	@(organization: Organization, favored:Boolean, isLast:Boolean = false)
8	8	@import utils.TemplateHelper._
9	9
10		-@isAllowShowCount() = @{
11		- UserApp.currentUser().isSiteManager \|\| UserApp.currentUser().isAdminOf(organization)
12		-}
13		-
14	10	@defining(UserApp.currentUser().getFavoriteProjects){ favoriteProjects =>
15	11	<li class="@if(isLast){favored} org-li">
16	12	<div class="org-list project-flex-container all-orgs">
...	...	@@ -20,7 +16,7 @@
20	16	</div>
21	17	<div class="projectName-owner all-org-names flex-item">
22	18	<div class="project-name org-name flex-item"><a href="@routes.OrganizationApp.organization(organization.name)" target="_blank">@organization.name</a></div>
23		- <div class="project-owner flex-item">@if(isAllowShowCount){@organization.projects.size()}</div>
	19	+ <div class="project-owner flex-item sub-project-counter"></div>
24	20	</div>
25	21	</div>
26	22	<div class="star-org flex-item" data-organization-id="@organization.id">

...	...	@@ -16,7 +16,7 @@
16	16	</div>
17	17	<div class="projectName-owner all-org-names flex-item">
18	18	<div class="project-name org-name flex-item">@UserApp.currentUser().loginId</div>
19		- <div class="project-owner flex-item">@ownProjects.size()</div>
	19	+ <div class="project-owner flex-item sub-project-counter"></div>
20	20	</div>
21	21	</div>
22	22	<div class="star-org flex-item">

Delete comment