Merge pull request #216 from Gid733/master

renemadsen · web-flow · commit 850a193b93de · 2019-02-22T12:47:37.000+01:00
Fix menu for disabled items
diff --git a/eFormAPI/eFormAPI.Web/Hosting/Helpers/PluginHelper.cs b/eFormAPI/eFormAPI.Web/Hosting/Helpers/PluginHelper.cs
@@ -64,19 +64,16 @@ public static List<IEformPlugin> GetPlugins(IConfiguration configuration)
                         {
                             var pluginDbName = $"Database={dbPrefix}_{plugin.PluginId};";
                             var pluginConnectionString = connectionString.Replace(dbNameSection, pluginDbName);
-                            var newPlugin = new EformPlugin()
+                            var newPlugin = new EformPlugin
                             {
                                 PluginId = plugin.PluginId,
                                 ConnectionString = pluginConnectionString,
                                 Status = (int) PluginStatus.Disabled
                             };
                             dbContext.EformPlugins.Add(newPlugin);
                             dbContext.SaveChanges();
-                            plugins.Add(plugin);
                         }
                     }
-
-
                 }
             }
 
diff --git a/eFormAPI/eFormAPI.Web/Services/UserService.cs b/eFormAPI/eFormAPI.Web/Services/UserService.cs
@@ -15,7 +15,6 @@ public class UserService : IUserService
         private readonly IHttpContextAccessor _httpAccessor;
         private readonly BaseDbContext _dbContext;
 
-
         public UserService(BaseDbContext dbContext,
             UserManager<EformUser> userManager,
             IHttpContextAccessor httpAccessor)
diff --git a/eFormAPI/eFormAPI.Web/Services/WorkersService.cs b/eFormAPI/eFormAPI.Web/Services/WorkersService.cs
@@ -60,7 +60,6 @@ public OperationResult Update(WorkerModel workerModel)
             }
         }
 
-
         public OperationResult Сreate(WorkerCreateModel model)
         {
             try

Original file line number	Diff line number	Diff line change
`@@ -64,19 +64,16 @@ public static List<IEformPlugin> GetPlugins(IConfiguration configuration)`
`64`	`64`	`{`
`65`	`65`	`var pluginDbName = $"Database={dbPrefix}_{plugin.PluginId};";`
`66`	`66`	`var pluginConnectionString = connectionString.Replace(dbNameSection, pluginDbName);`
`67`		`- var newPlugin = new EformPlugin()`
	`67`	`+ var newPlugin = new EformPlugin`
`68`	`68`	`{`
`69`	`69`	`PluginId = plugin.PluginId,`
`70`	`70`	`ConnectionString = pluginConnectionString,`
`71`	`71`	`Status = (int) PluginStatus.Disabled`
`72`	`72`	`};`
`73`	`73`	`dbContext.EformPlugins.Add(newPlugin);`
`74`	`74`	`dbContext.SaveChanges();`
`75`		`- plugins.Add(plugin);`
`76`	`75`	`}`
`77`	`76`	`}`
`78`		`-`
`79`		`-`
`80`	`77`	`}`
`81`	`78`	`}`
`82`	`79`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ public OperationResult Update(WorkerModel workerModel)`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`-`
`64`	`63`	`public OperationResult Сreate(WorkerCreateModel model)`
`65`	`64`	`{`
`66`	`65`	`try`