Changeset 13827 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers

Timestamp:

05/03/16 17:13:50 (9 years ago)

Author:

jlodewyc

Message:

#2582 Parameter changing busy, save file, download file and email on pass reset

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers

Files:

• JobController.cs (modified) (1 diff)
• UserController.cs (modified) (3 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/JobController.cs

@@ -310 +310 @@
             }
         }
-        //TODO Work in progress
-        /* public async Task<IActionResult> DownloadFile(int index, int filedex)
-         {
-             if (((HiveServiceLocatorWeb)(HiveServiceLocatorWeb.Instance)).CheckLogin())
-             {
-                 UploadedJobViewModel upper = new UploadedJobViewModel();
-                 fillUploadsPaths(upper, index);
-
-                HttpContext.Response.ContentType = "APPLICATION/OCTET-STREAM";
-                 String Header = "Attachment; Filename=" + upper.DisplayFilesPaths[filedex];
-                 HttpContext.Response.Headers.Add("Content-Disposition", Header);
-                 System.IO.FileInfo Dfile = new System.IO.FileInfo(upper.FullFilesPaths[filedex]);
-                 await HttpContext.Response.WriteAsync(Dfile.FullName);
-                 //HttpContext.Response.End();
-
-                 var message = upper.DisplayFilesPaths[filedex] + " has been downloaded";
-
-                 upper.message = message;
-                 ViewBag.Title = "Downloaded file";
-
-                 return View("Uploads", upper);
-             }
+        [HttpPost]
+        public IActionResult saveToFile(string fname)
+        {
+            if (init())
+            {
+                weblog.getFileOpener(userId).SaveToFile(fname);
+                return RedirectToAction("Uploads", "Job");
+            }
              else
-             {
-                 HiveServiceLocatorWeb.SetLoginErrorMessage();
-                 return RedirectToAction("Index", "Home");
-             }
-         }*/
+            {
+                return RedirectToAction("Index", "Home");
+            }
+        }
+
+        public FileResult DownloadFile(int index, int filedex)
+        {
+            if (init())
+            {
+                UploadedJobViewModel upper = new UploadedJobViewModel();
+                fillUploadsPaths(upper, index);
+
+                System.IO.FileInfo Dfile = new System.IO.FileInfo(upper.FullFilesPaths[filedex]);
+                var fileName = Dfile.Name;
+                byte[] fileBytes = System.IO.File.ReadAllBytes(upper.FullFilesPaths[filedex]);
+                return File(fileBytes, "application/x-msdownload", fileName);
+            }
+            else
+            {
+                return null;
+            }
+        }
 
         #endregion

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/UserController.cs

@@ -132 +132 @@
                     user.UserName = inpusername;
                     uid = accessClient.addUser(user);
+                    accessClient.RefreshUsers();
                     var newpass = accessClient.resetPassword(uid);
                     sendPassmail(accessClient.Users.Find(x => x.Id == uid), newpass);
@@ -172 +173 @@
         public static void sendPassmail(Access.User u, string pass)
         {/*
-            SmtpClient smtpClient = new SmtpClient("mail.MyWebsiteDomainName.com", 25);
-
-            smtpClient.Credentials = new System.Net.NetworkCredential("info@MyWebsiteDomainName.com", "myIDPassword");
+            SmtpClient smtpClient = new SmtpClient("smtp.gmail.com",587);
             smtpClient.UseDefaultCredentials = true;
+            smtpClient.Credentials = new System.Net.NetworkCredential("trac.heuristiclab@gmail.com", "||||||||||||");
             smtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
             smtpClient.EnableSsl = true;
@@ -181 +181 @@
 
             //Setting From , To and CC
-            mail.From = new MailAddress("info@MyWebsiteDomainName", "MyWeb Site");
+            mail.From = new MailAddress("trac.heuristiclab@gmail.com", "HeuristicLab");
             mail.Subject = "Password changed - HeuristicLab Hive";
-            mail.Body = "Hello " + u.FullName + ", " +
-                "Your password was changed through the HeuristicLab Hive web application." +
-                "The new password for " + u.UserName + " is '" + pass + "'.";
+            mail.Body = "Hello " + u.FullName + ", " + Environment.NewLine + Environment.NewLine+
+                "Your password was changed through the HeuristicLab Hive web application." + Environment.NewLine+
+                "The new password for " + u.UserName + " is ' " + pass + " '." + Environment.NewLine + Environment.NewLine +
+                "HeuristicLab Hive";
             mail.To.Add(new MailAddress(u.Email));