Skip to content

Commit ed9cde0

Browse files
committed
Export fix
1 parent b632643 commit ed9cde0

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

app/com/kyleu/projectile/web/controllers/project/ProjectController.scala

+3-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ class ProjectController @javax.inject.Inject() () extends ProjectileController {
4747
Future.successful(Ok(ExampleProjectHelper.compileAll().map(x => x._1 + ": " + x._2).mkString("\n")))
4848
}
4949

50-
def exampleExtract(k: String) = Action.async { _ =>
51-
ProjectExampleService.extract(k, root / k, k)
50+
def exampleExtract(k: String) = Action.async { request =>
51+
val t = request.queryString.get("t").flatMap(_.headOption).getOrElse(k)
52+
ProjectExampleService.extract(k, root / t, t)
5253
Future.successful(Ok("OK"))
5354
}
5455
}

examples/admin/app/models/module/ProjectileModule.scala

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import models.template.UserMenu
1212
import util.Version
1313

1414
class ProjectileModule extends AdminModule {
15+
override def projectVersion = Version.version
1516
override def projectName = Version.projectName
1617
override def allowSignup = true
1718
override def initialRole = "admin"

projectile-export/src/main/scala/com/kyleu/projectile/models/feature/graphql/db/SchemaObjectType.scala

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.kyleu.projectile.models.output.file.ScalaFile
77

88
object SchemaObjectType {
99
def addObjectType(config: ExportConfiguration, model: ExportModel, file: ScalaFile) = {
10+
file.addImport(Seq("sangria", "macros", "derive"), "DocumentField")
1011
val columnsDescriptions = model.fields.flatMap(col => col.description.map(d => s"""DocumentField("${col.propertyName}", "$d")"""))
1112
val references = ExportModelReference.validReferences(config, model)
1213
val withNotes = ( /* TODO */ 1 == 2) && model.pkColumns.nonEmpty && model.features(ModelFeature.Notes)

0 commit comments

Comments
 (0)