Merge branch 'redmine-6' of https://github.com/noshutdown-ru/vault into redmine-6

# Conflicts:
#	app/controllers/keys_controller.rb
#	app/controllers/tags_controller.rb

Author: mr-exz

Gemfile

@@ -8,4 +8,3 @@ group :test, :development do
   gem 'byebug'
   gem 'capybara-screenshot'
 end
-

app/controllers/keys_controller.rb

@@ -10,7 +10,6 @@ class KeysController < ApplicationController
   helper ContextMenusHelper
 
   def index
-
     unless Setting.plugin_vault['use_redmine_encryption'] ||
       Setting.plugin_vault['use_null_encryption']
       if not Setting.plugin_vault['encryption_key'] or Setting.plugin_vault['encryption_key'].empty?
@@ -129,10 +128,10 @@ def copy
 
   def create
     save_file if key_params[:file]
-    @key = Vault::Key.new(key_params)
-
+    @key = Vault::Key.new
+    @key.safe_attributes = key_params.except(:tags)
     @key.project = @project
-
+    
     self.update_wishlist
 
     respond_to do |format|
@@ -148,6 +147,7 @@ def update
     save_file if key_params[:file]
     respond_to do |format|
       self.update_wishlist
+      @key.safe_attributes = key_params.except(:tags)
 
       if @key.update(key_params)
         @key.tags = key_params[:tags]

app/controllers/tags_controller.rb

@@ -18,7 +18,8 @@ def create
   end
 
   def update
-    if @tag.update(tag_params)
+    @tag.safe_attributes = tag_params
+    if @tag.save
       redirect_to project_key_tags_path(@project, @key), notice: 'Tag was successfully updated.'
     else
       render :index
@@ -47,4 +48,4 @@ def find_tag
   def tag_params
     params.require(:tag).permit(:name, :color)
   end
-end
+end

app/models/vault/key.rb

@@ -46,7 +46,6 @@ def self.import(file)
               whitelist: rhash['comment']
             ).update_column(:id, rhash['id'])
           rescue
-
           end
         else
           begin
@@ -85,5 +84,4 @@ def whitelisted?(user, project)
 
   class Vault::KeysVaultTags < ActiveRecord::Base
   end
-
 end

app/models/vault/key_file.rb

@@ -2,7 +2,6 @@ module Vault
   class KeyFile < Key
     before_update :update_file, if: :file_changed?
     before_destroy :delete_file
-
     private
 
     def update_file

app/models/vault/tag.rb

@@ -3,7 +3,9 @@ class Tag < ActiveRecord::Base
     include Redmine::SafeAttributes
 
     self.table_name = 'vault_tags'
-    has_and_belongs_to_many :keys, join_table: 'keys_vault_tags'
+    has_and_belongs_to_many :keys
+
+    safe_attributes 'name', 'color'
 
     safe_attributes 'name', 'color'
 

assets/javascripts/vault.js

@@ -30,4 +30,4 @@ $(function () {
 		hiddenLabel.toggle();
 		hiddenLabel.prev().toggle();
 	}
-});
+});