tramway-admin 1.15 → 1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cf845dbda8af54237e9ce7894ce89b207b4205cf872c74dbc7d0285a21d3930
-  data.tar.gz: e6736dc2c93fe3d6682f88e2f98bcd062a02b8556f4caabd31a348d9f16804a9
+  metadata.gz: 95fd79f59a798514d92e526c901116e095adc76842182c48dbd958fe9e805dec
+  data.tar.gz: a2b9af24be0a5635b102963806b840255d22ee8914a2b8c5f098ea839795d627
 SHA512:
-  metadata.gz: 64d48bc859377a33466fee90b9c9cba22dc6d392a86881b9a3f55502a5e68502a1b6cfbaf9784590023d6da999a65033eaa21e55247d0f842abe7d2c8e14df98
-  data.tar.gz: 4b745fb984fc04456b33bdbc0349e81d7a4fb0e2a28ee473218d46cb95fca966ab95f3b538b3d2ed8ee1923b66376b0088a82745b412b19bd296285e78d37d6d
+  metadata.gz: 2158f7d8bc2f968842e93f6e235d9312eee4d1425e04b5f9b7c51f92dbb53906165256f3c8066ad2123632592d00ed80674c38ec1a3d9214eac07262191ab9da
+  data.tar.gz: a5c297985a6d08c8382bfdf853a9472faf71b50b8baab1e99ff4ac7b3dc5875dfc76fc57261e3ab6cf4dfa6b4ae8da6c889c722a277289a02ab0cd59dece7134

data/app/controllers/tramway/admin/application_controller.rb

@@ -56,8 +56,8 @@ module Tramway
         decorator_class_name
       end
 
-      def form_class
-        form_class_name
+      def admin_form_class
+        "Admin::#{model_class}Form".constantize
       end
 
       def model_given?

data/app/controllers/tramway/admin/records_controller.rb

@@ -12,11 +12,11 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
   end
 
   def edit
-    @record_form = form_class.new model_class.active.find params[:id]
+    @record_form = admin_form_class.new model_class.active.find params[:id]
   end
 
   def update
-    @record_form = form_class.new model_class.active.find params[:id]
+    @record_form = admin_form_class.new model_class.active.find params[:id]
     if @record_form.submit params[:record]
       redirect_to params[:redirect] || record_path(@record_form.model)
     else
@@ -25,11 +25,11 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
   end
 
   def new
-    @record_form = form_class.new model_class.new
+    @record_form = admin_form_class.new model_class.new
   end
 
   def create
-    @record_form = form_class.new model_class.new
+    @record_form = admin_form_class.new model_class.new
     if @record_form.submit params[:record]
       redirect_to params[:redirect] || record_path(@record_form.model)
     else

data/app/controllers/tramway/admin/singletons_controller.rb

@@ -11,11 +11,11 @@ module Tramway::Admin
     end
 
     def edit
-      @singleton_form = form_class.new model_class.active.first
+      @singleton_form = admin_form_class.new model_class.active.first
     end
 
     def create
-      @singleton_form = form_class.new
+      @singleton_form = admin_form_class.new
       if @singleton_form.submit params[:singleton]
         redirect_to params[:redirect] || singleton_path(model: params[:model])
       else
@@ -24,7 +24,7 @@ module Tramway::Admin
     end
 
     def update
-      @singleton_form = form_class.new model_class.active.first
+      @singleton_form = admin_form_class.new model_class.active.first
       if @singleton_form.submit params[:singleton]
         redirect_to params[:redirect] || singleton_path(model: params[:model])
       else

data/lib/tramway/admin/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Admin
-    VERSION = '1.15'
+    VERSION = '1.16'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: '1.15'
+  version: '1.16'
 platform: ruby
 authors:
 - Pavel Kalashnikov