multi source style loading

2023-01-27 19:08:57 +02:00
parent 1270c59492
commit df67ed16b5
26 changed files with 37 additions and 33 deletions
--- a/app/controllers/merged/changes_controller.rb
+++ b/app/controllers/merged/changes_controller.rb
@ -15,7 +15,7 @@ module Merged
      else
        git = Git.open(Rails.root)
        git.add("merged")
-        git.add( Image.root )
+        git.add( Image.asset_root )
        begin
          git.config('user.email', current_member.email)
          git.commit(params[:message])
@ -30,8 +30,8 @@ module Merged
    def reset
      git = Git.open(Rails.root)
      begin
-        git.checkout_file("HEAD" , "merged")
-        git.checkout_file("HEAD" , "app/assets/images/cms")
+        git.checkout_file("HEAD" , Merged.data_dir)
+        git.checkout_file("HEAD" , Merged::Image.asset_root)
        ChangeSet.current.zero
        message = "Changes reset"
      rescue