Bug fix

diff --git a/PartsList/PartsList/app/controllers/PartsListController.scala b/PartsList/PartsList/app/controllers/PartsListController.scala
index e3cd9e2..320de59 100644 (file)
--- a/PartsList/PartsList/app/controllers/PartsListController.scala
+++ b/PartsList/PartsList/app/controllers/PartsListController.scala
@@ -55,7 +55,7 @@ object PartsListController extends Controller{
          Ok(views.html.partslistshow(partBuffer.drop(page*row).take(row), opt, page, partBuffer.size, key))
        }
 
-       def upIndex(opt:Int, page:Int, key:String) = Action {
+       def upIndex(opt:Int, page:Int, key:String) = Action { implicit request =>
          var partBuffer = ArrayBuffer[PartsListBean]()
          inTransaction {
                  for (childPart <- PartsListDb.parts.where(p => p.name like key +"%")) {
@@ -96,7 +96,7 @@ object PartsListController extends Controller{
                      PartRelationManager().insert(data)
                          Home.flashing("success" -> "Relation %s has been created".format(data.parent))
                    } else {
-                Ok(views.html.createRelationForm(relationForm.fill(data), message))
+                Ok(views.html.createRelationForm(relationForm.fill(data), Messages(message)))
                    }
                   }
          }

diff --git a/PartsList/PartsList/app/controllers/services/Check.scala b/PartsList/PartsList/app/controllers/services/Check.scala
index 6231c51..71ce954 100644 (file)
--- a/PartsList/PartsList/app/controllers/services/Check.scala
+++ b/PartsList/PartsList/app/controllers/services/Check.scala
@@ -1,26 +1,26 @@
 package controllers.services
 import scala.collection.mutable.ArrayBuffer
 import beans._
-import play.api.i18n._
+
 case class Check() {
   def loopCheck(partBuffer: ArrayBuffer[PartsListBean], upPartBuffer: ArrayBuffer[PartsListBean], data: PartsListBean):String = {
        // 部品表ループチェック
        // 親品番＝子品番 の場合エラー
     var message:String = null
        if(data.child.equals(data.parent)) {
-         message = Messages("form.error1")
+         message = "form.error1"
        } else {
          // 子品番=親品番の逆展開 の場合エラー
          for(upPart <- upPartBuffer ) {
            if(upPart.child.equals(data.child)) {
-             message = Messages("form.error1")
+             message = "form.error1"
             }
           }
           // 子品番の正展開=親品番の逆展開 の場合エラー
          for(chPart <- partBuffer) {
            for(upPart <- upPartBuffer) {
              if(upPart.child.equals(chPart.child)) {
-               message = Messages("form.error1")
+               message = "form.error1"
               }
             }
           }

diff --git a/PartsList/PartsList/app/views/uppartslistshow.scala.html b/PartsList/PartsList/app/views/uppartslistshow.scala.html
index e688bbe..033ccd1 100644 (file)
--- a/PartsList/PartsList/app/views/uppartslistshow.scala.html
+++ b/PartsList/PartsList/app/views/uppartslistshow.scala.html
@@ -1,4 +1,4 @@
-@(partsLists: scala.collection.mutable.ArrayBuffer[beans.PartsListBean], opt:Int, page:Int, maxColumn:Int, key:String)
+@(partsLists: scala.collection.mutable.ArrayBuffer[beans.PartsListBean], opt:Int, page:Int, maxColumn:Int, key:String)(implicit lang: Lang)
 @import models.Part
 @import beans.PartsListBean