From f15dd87d97e325f718c62668c211f3392c350f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D1=8F=20=D0=91=D0=B8=D0=B7=D1=8E=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0?= Date: Thu, 23 Nov 2023 12:01:12 +0500 Subject: [PATCH] =?UTF-8?q?1.=20=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=B9=20=D1=80=D0=B0=D0=B7=D1=80?= =?UTF-8?q?=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BD=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D1=81=D0=BC=D0=BE=D1=82=D1=80,=20=D1=80=D0=B5?= =?UTF-8?q?=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D1=84=D0=B0=D0=BA=D1=82=D0=B8=D1=87=D0=B5=D1=81?= =?UTF-8?q?=D0=BA=D0=B8=D1=85=20=D0=B8=20=D0=BD=D0=BD=D0=B1-=D1=82=D1=80?= =?UTF-8?q?=D0=B0=D0=B5=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=B9=202.=20=D0=A3?= =?UTF-8?q?=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B0=D0=B7?= =?UTF-8?q?=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE?= =?UTF-8?q?=D1=82=D1=87=D0=B5=D1=82=D0=BE=D0=B2=20drill=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...303_Add_Permissions_For_Trajectory_Fact.cs | 22 +++++++++---------- ...4844_Add_Permissions_For_Trajectory_Nnb.cs | 8 +++---- .../AsbCloudDbContextModelSnapshot.cs | 6 ++--- .../DefaultData/EntityFillerPermission.cs | 8 +++---- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/AsbCloudDb/Migrations/20231115102303_Add_Permissions_For_Trajectory_Fact.cs b/AsbCloudDb/Migrations/20231115102303_Add_Permissions_For_Trajectory_Fact.cs index af56dae7..27d98155 100644 --- a/AsbCloudDb/Migrations/20231115102303_Add_Permissions_For_Trajectory_Fact.cs +++ b/AsbCloudDb/Migrations/20231115102303_Add_Permissions_For_Trajectory_Fact.cs @@ -13,8 +13,8 @@ namespace AsbCloudDb.Migrations columns: new[] { "id", "description", "name" }, values: new object[,] { - { 530, "Разрешение просматривать фактические траектории", "FactTrajectory.get" }, - { 531, "Разрешение редактировать фактические траектории", "FactTrajectory.edit" } + { 529, "Разрешение просматривать фактические траектории", "FactTrajectory.get" }, + { 530, "Разрешение редактировать фактические траектории", "FactTrajectory.edit" } }); migrationBuilder.InsertData( @@ -22,8 +22,8 @@ namespace AsbCloudDb.Migrations columns: new[] { "id_permission", "id_user_role" }, values: new object[,] { - { 530, 1 }, - { 531, 1 } + { 529, 1 }, + { 530, 1 } }); } @@ -32,22 +32,22 @@ namespace AsbCloudDb.Migrations migrationBuilder.DeleteData( table: "t_relation_user_role_permission", keyColumns: new[] { "id_permission", "id_user_role" }, - keyValues: new object[] { 530, 1 }); + keyValues: new object[] { 529, 1 }); migrationBuilder.DeleteData( table: "t_relation_user_role_permission", keyColumns: new[] { "id_permission", "id_user_role" }, - keyValues: new object[] { 531, 1 }); + keyValues: new object[] { 530, 1 }); + + migrationBuilder.DeleteData( + table: "t_permission", + keyColumn: "id", + keyValue: 529); migrationBuilder.DeleteData( table: "t_permission", keyColumn: "id", keyValue: 530); - - migrationBuilder.DeleteData( - table: "t_permission", - keyColumn: "id", - keyValue: 531); } } } diff --git a/AsbCloudDb/Migrations/20231116094844_Add_Permissions_For_Trajectory_Nnb.cs b/AsbCloudDb/Migrations/20231116094844_Add_Permissions_For_Trajectory_Nnb.cs index 3c6e6bbd..506bc8f4 100644 --- a/AsbCloudDb/Migrations/20231116094844_Add_Permissions_For_Trajectory_Nnb.cs +++ b/AsbCloudDb/Migrations/20231116094844_Add_Permissions_For_Trajectory_Nnb.cs @@ -11,12 +11,12 @@ namespace AsbCloudDb.Migrations migrationBuilder.InsertData( table: "t_permission", columns: new[] { "id", "description", "name" }, - values: new object[] { 532, "Разрешение просматривать фактические ннб-траектории", "NnbTrajectory.get" }); + values: new object[] { 531, "Разрешение просматривать фактические ннб-траектории", "NnbTrajectory.get" }); migrationBuilder.InsertData( table: "t_relation_user_role_permission", columns: new[] { "id_permission", "id_user_role" }, - values: new object[] { 532, 1 }); + values: new object[] { 531, 1 }); } protected override void Down(MigrationBuilder migrationBuilder) @@ -24,12 +24,12 @@ namespace AsbCloudDb.Migrations migrationBuilder.DeleteData( table: "t_relation_user_role_permission", keyColumns: new[] { "id_permission", "id_user_role" }, - keyValues: new object[] { 532, 1 }); + keyValues: new object[] { 531, 1 }); migrationBuilder.DeleteData( table: "t_permission", keyColumn: "id", - keyValue: 532); + keyValue: 531); } } } diff --git a/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs b/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs index acbe5e45..a8c0ed61 100644 --- a/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs +++ b/AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs @@ -2488,19 +2488,19 @@ namespace AsbCloudDb.Migrations }, new { - Id = 530, + Id = 529, Description = "Разрешение просматривать фактические траектории", Name = "FactTrajectory.get" }, new { - Id = 531, + Id = 530, Description = "Разрешение редактировать фактические траектории", Name = "FactTrajectory.edit" }, new { - Id = 532, + Id = 531, Description = "Разрешение просматривать фактические ннб-траектории", Name = "NnbTrajectory.get" }); diff --git a/AsbCloudDb/Model/DefaultData/EntityFillerPermission.cs b/AsbCloudDb/Model/DefaultData/EntityFillerPermission.cs index 67e50993..c21b05c1 100644 --- a/AsbCloudDb/Model/DefaultData/EntityFillerPermission.cs +++ b/AsbCloudDb/Model/DefaultData/EntityFillerPermission.cs @@ -162,11 +162,9 @@ new() { Id = 527, Name = "Manual.delete", Description = "Разрешение на удаление инструкций"}, new (){ Id = 528, Name="WellContact.delete", Description="Разрешение на удаление контакта"}, - new (){ Id = 529, Name="DrillTestReport.get", Description="Разрешение на получение отчетов drill test"}, - - new (){ Id = 530, Name="FactTrajectory.get", Description="Разрешение просматривать фактические траектории"}, - new (){ Id = 531, Name="FactTrajectory.edit", Description="Разрешение редактировать фактические траектории"}, - new (){ Id = 532, Name="NnbTrajectory.get", Description="Разрешение просматривать фактические ннб-траектории"}, + new (){ Id = 529, Name="FactTrajectory.get", Description="Разрешение просматривать фактические траектории"}, + new (){ Id = 530, Name="FactTrajectory.edit", Description="Разрешение редактировать фактические траектории"}, + new (){ Id = 531, Name="NnbTrajectory.get", Description="Разрешение просматривать фактические ннб-траектории"}, }; } }