Merge branch 'dev/dotnet' of https://github.com/codedx/codepulse into dev/dotnet

Steve Salas · Steve Salas · commit 42d9850e6125 · 2018-03-27T07:53:04.000-04:00
diff --git a/codepulse/src/main/resources/toserve/pages/projects/trace-recording-controls.js b/codepulse/src/main/resources/toserve/pages/projects/trace-recording-controls.js
@@ -440,7 +440,7 @@
 			addedRecordings = d3.set()
 
 		Trace.status.onValue(function(status){
-			isRunning = (status == 'running')
+			isRunning = (status.name == 'running')
 			$adderButton.toggleClass('disabled', !isRunning)
 		})
 
diff --git a/codepulse/src/main/scala/bootstrap/liftweb/FileUploadSetup.scala b/codepulse/src/main/scala/bootstrap/liftweb/FileUploadSetup.scala
@@ -40,7 +40,7 @@ import com.secdec.codepulse.util.ManualOnDiskFileParamHolder
 
 object FileUploadSetup extends Loggable {
 
-	val MaxFileSize = 200 * 1024 * 1024
+	val MaxFileSize = 500 * 1024 * 1024
 
 	def init(liftRules: LiftRules) = {
 		setupMimeHandler(liftRules)
diff --git a/codepulse/src/main/scala/com/secdec/codepulse/data/jsp/JasperJspAdapter.scala b/codepulse/src/main/scala/com/secdec/codepulse/data/jsp/JasperJspAdapter.scala
@@ -50,7 +50,7 @@ class JasperJspAdapter extends JspAdapter {
 		}
 
 		// build up
-		jspClasses.result.toList map {
+		jsps map {
 			case (clazz, size) =>
 				val jspClassName = JasperUtils.makeJavaClass(clazz)
 				val displayName = clazz.split('/').filter(!_.isEmpty).toList

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class JasperJspAdapter extends JspAdapter {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`// build up`
`53`		`- jspClasses.result.toList map {`
	`53`	`+ jsps map {`
`54`	`54`	`case (clazz, size) =>`
`55`	`55`	`val jspClassName = JasperUtils.makeJavaClass(clazz)`
`56`	`56`	`val displayName = clazz.split('/').filter(!_.isEmpty).toList`