diff --git a/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml b/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml
index 75b049bd..7a46a7d6 100644
--- a/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml
@@ -818,13 +818,7 @@
- @*
-
-
-
-
*@
+
@* امور ماهیانه پرسنل *@
@@ -836,13 +830,25 @@
- @*
+
+
+
+
+
+
+
+
diff --git a/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml b/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml
index e25f3652..11e2f5b0 100644
--- a/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml
@@ -820,13 +820,6 @@
- @*
-
-
-
-
*@
@@ -843,7 +836,7 @@
-
+
@@ -853,18 +846,12 @@
-
+
- @*
-
-
-
*@
diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml
index 9e67c7ec..a4b69ed6 100644
--- a/ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml
+++ b/ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml
@@ -6,8 +6,12 @@
var adminVersion = _0_Framework.Application.Version.AdminVersion;
string clientVersion = _0_Framework.Application.Version.StyleVersion;
ViewData["Title"] = " - " + "کارگاه";
- var currentAccount = AuthHelper.CurrentAccountInfo();
- List permission = currentAccount.Permissions();
+
+
+
+
+ var hasNextPermission = AuthHelper.GetPermissions().Any(x => x == 501);
+ var hasPrevPermission = AuthHelper.GetPermissions().Any(x => x == 502);
}
@section Styles {
@@ -403,8 +407,9 @@
var currentMonth = `@Model.SearchModel.Month`;
var adminAccountId = Number(@Model.SearchModel.AdminAccountId);
- var nextPermission = @permission.Contains(5001);
- var prevPermission = @permission.Contains(5002);
+ var nextPermission = @(hasNextPermission ? "false" : "true");
+ var prevPermission = @(hasPrevPermission ? "false" : "true");
+
}
\ No newline at end of file