redmine_with_git 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25be104e9c0c3b37180b555ca315c6f67823b290dad84ecf39329a7fcf5c6cb3
-  data.tar.gz: 0b52c5a42db23a47750b54fdc7fd7751b1392ee861415974fb2a9aa6e38acbec
+  metadata.gz: e52be3e9ada1bb48f3b86fd07aa74ca17ebe3879cbb8cbcec839dd0aa1cc8552
+  data.tar.gz: 46b1cf44b1598a96029f444d25a08daca538e3b09ea4346070e88f6ce8dedd96
 SHA512:
-  metadata.gz: 24aee9f362034257dc8600ecdcc9d875bea79be1daf7f41ce9416776ce2258fe73928b589ac1fa54cf690b0701d2345b3e508949284472f6d6f1fd4a617b70d2
-  data.tar.gz: 55df434025cd75829e68acf441a238449d5ff584d3eb52a7e57711fdb5b72637f9bce29fab54a7f2859ddca6c8db3e038ffbb41f9d6b7f3581bb9ba8a87a299e
+  metadata.gz: 20e2702e1b74fbf0a04fff44adb099837daf4a88e516c452193bea3915b3a90abec4b2c2fa1d9532b6c04f6797034effdac70aad13a05bb7db6d26552efc27cf
+  data.tar.gz: 5fd8ad57fc3e7604bb06398bfdefe1bb2be1868937e772266faa3e2c1e61d81851e7693e0e3583421f241b351be3f83f772d3026c6dcee3743cc888055cc3fa8

data/app/controllers/{redmine_with_git_controller.rb → backup_controller.rb}

@@ -1,7 +1,15 @@
 # frozen_string_literal: true
 
-class RedmineWithGitController < ApplicationController
-  before_filter :require_admin
+class BackupController < ApplicationController
+  EXPORT_PERMISSION = 'redmine_with_git.backup.export'
+  IMPORT_PERMISSION = 'redmine_with_git.backup.import'
+
+  PERMISSIONS = { or: [EXPORT_PERMISSION, IMPORT_PERMISSION] }.freeze
+
+  layout 'nonproject_modules'
+  require_permission PERMISSIONS, only: [:index]
+  require_permission EXPORT_PERMISSION, only: [:export]
+  require_permission IMPORT_PERMISSION, only: [:import]
 
   accept_api_auth :export, :import
 
@@ -13,7 +21,10 @@ class RedmineWithGitController < ApplicationController
 
   def export
     Tempfile.open('redmine_export') do |file|
-      ::RedmineWithGit::Dump::All.new(file.path, true)
+      ::RedmineWithGit::Dump::All.new(
+        file.path,
+        overwrite: ::RedmineWithGit::Dump::Base::OVERWRITE_ALLOWED
+      )
       send_file(file.path, filename: export_file_name, type: 'application/x-tar',
                            size: file.size)
     end
@@ -32,7 +43,7 @@ class RedmineWithGitController < ApplicationController
 
   def import_respond_to_html
     if @load.errors.empty?
-      redirect_to redmine_with_git_path, notice: 'Backup imported'
+      redirect_to backup_path, notice: 'Backup imported'
     else
       render :index
     end

data/app/helpers/redmine_with_git_helper.rb

@@ -2,7 +2,7 @@
 
 module RedmineWithGitHelper
   def export_api_curl_command
-    curl_command("curl -JLO '#{export_redmine_with_git_url(key: User.current.api_key)}'")
+    curl_command("curl -JLO '#{export_backup_url(key: User.current.api_key)}'")
   end
 
   def import_api_curl_command
@@ -10,7 +10,7 @@ module RedmineWithGitHelper
       curl -X POST \\
         -F '#{import_param_key}=@<PATH_TO_BACKUP_FILE>' \\
         -F 'key=#{User.current.api_key}' \\
-        #{import_redmine_with_git_url(format: 'json')}
+        #{import_backup_url(format: 'json')}
     IMPORT_CURL
   end
 

data/app/views/backup/_api.html.erb

@@ -0,0 +1,14 @@
+<div>
+  <%= link_to_function(l(:button_show), "$('#redmine_with_git_api').toggle();")%>
+  <div id='redmine_with_git_api' class="autoscroll" >
+    <% if ::GroupPermission.permission?(::BackupController::EXPORT_PERMISSION) %>
+      <h4>Export CURL command</h4>
+      <%= export_api_curl_command %>
+    <% end %>
+    <% if ::GroupPermission.permission?(::BackupController::IMPORT_PERMISSION) %>
+      <h4>Import CURL command</h4>
+      <%= import_api_curl_command %>
+    <% end %>
+  </div>
+</div>
+<%= javascript_tag("$('#redmine_with_git_api').hide();") %>

data/app/views/backup/_export.html.erb

@@ -0,0 +1 @@
+<%= link_to 'Export', export_backup_path %>

data/app/views/{redmine_with_git → backup}/_import.html.erb

@@ -1,4 +1,4 @@
-<%= labelled_form_for @load, url: import_redmine_with_git_path, method: :post do |f| %>
+<%= labelled_form_for @load, url: import_backup_path, method: :post do |f| %>
   <%= error_messages_for @load %>
   <div class="box tabular">
     <p>

data/app/views/backup/index.html.erb

@@ -0,0 +1,13 @@
+<h2>Redmine With Git</h2>
+<% if ::GroupPermission.permission?(::BackupController::EXPORT_PERMISSION) %>
+  <h3>Export</h3>
+  <%= render partial: 'export' %>
+<% end %>
+<% if ::GroupPermission.permission?(::BackupController::IMPORT_PERMISSION) %>
+  <h3>Import</h3>
+  <%= render partial: 'import' %>
+<% end %>
+<% if Setting.rest_api_enabled? %>
+  <h3>API</h3>
+  <%= render partial: 'api' %>
+<% end %>

data/config/initializers/000_dependencies.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 Redmine::Plugin.post_register :redmine_with_git do
-  # Source: https://github.com/esquilo-azul/redmine_plugins_helper
-  requires_redmine_plugin(:redmine_plugins_helper, version_or_higher: '0.5.2')
+  # Source: https://github.com/esquilo-azul/redmine_nonproject_modules
+  requires_redmine_plugin(:redmine_nonproject_modules, version_or_higher: '0.3.0')
   # Source: https://github.com/jbox-web/redmine_bootstrap_kit.git
   # Note: redmine_bootstrap_kit is a redmine_git_hosting's dependency.
   requires_redmine_plugin(:redmine_bootstrap_kit, version_or_higher: '0.2.5')

data/config/initializers/500_nonproject_modules.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Redmine::MenuManager.map :redmine_with_git do |menu|
+  menu.push_controller(:backup)
+end

data/config/locales/en.yml

@@ -1,4 +1,5 @@
 en:
+  label_backup: Backup
   eac_ruby_utils:
     listable:
       redmine_with_git/dump/base:
@@ -8,3 +9,7 @@ en:
           denied:
             label: Denied
   field_path: Path
+  permission_redmine_with_git:
+    backup:
+      export_description: Allows to export the backup package.
+      import_description: Allows to import a backup package.

data/config/locales/pt-BR.yml

@@ -1,4 +1,5 @@
 pt-BR:
+  label_backup: Backup
   eac_ruby_utils:
     listable:
       redmine_with_git/dump/base:
@@ -8,3 +9,7 @@ pt-BR:
           denied:
             label: Negado
   field_path: Caminho
+  permission_redmine_with_git:
+    backup:
+      export_description: Permite exportar o pacote de backup.
+      import_description: Permite importar um pacote de backup.

data/config/routes.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RedmineApp::Application.routes.draw do
-  get '/redmine_with_git', to: 'redmine_with_git#index', as: 'redmine_with_git'
-  get '/redmine_with_git/export', to: 'redmine_with_git#export', as: 'export_redmine_with_git'
-  post '/redmine_with_git/import', to: 'redmine_with_git#import', as: 'import_redmine_with_git'
+  get '/backup', to: 'backup#index', as: 'backup'
+  get '/backup/export', to: 'backup#export', as: 'export_backup'
+  post '/backup/import', to: 'backup#import', as: 'import_backup'
 end

data/init.rb

@@ -13,10 +13,4 @@ Redmine::Plugin.register :redmine_with_git do
   version ::RedmineWithGit::VERSION
   url 'https://github.com/esquilo-azul/redmine_with_git'
   author_url 'https://github.com/esquilo-azul'
-
-  Redmine::MenuManager.map :admin_menu do |menu|
-    menu.push :redmine_with_git, { controller: 'redmine_with_git', action: 'index', id: nil },
-              caption: 'Redmine with Git',
-              if: proc { User.current.admin? }
-  end
 end

data/lib/redmine_with_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RedmineWithGit
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_with_git
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2019-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-tools
@@ -64,15 +64,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/controllers/redmine_with_git_controller.rb
+- app/controllers/backup_controller.rb
 - app/helpers/redmine_with_git_helper.rb
 - app/models/redmine_with_git/tableless/load.rb
-- app/views/redmine_with_git/_api.html.erb
-- app/views/redmine_with_git/_export.html.erb
-- app/views/redmine_with_git/_import.html.erb
-- app/views/redmine_with_git/index.html.erb
+- app/views/backup/_api.html.erb
+- app/views/backup/_export.html.erb
+- app/views/backup/_import.html.erb
+- app/views/backup/index.html.erb
 - config/initializers/000_dependencies.rb
 - config/initializers/001_patches.rb
+- config/initializers/500_nonproject_modules.rb
 - config/locales/en.yml
 - config/locales/pt-BR.yml
 - config/routes.rb

data/app/views/redmine_with_git/_api.html.erb

@@ -1,10 +0,0 @@
-<div>
-  <%= link_to_function(l(:button_show), "$('#redmine_with_git_api').toggle();")%>
-  <div id='redmine_with_git_api' class="autoscroll" >
-    <h4>Export CURL command</h4>
-    <%= export_api_curl_command %>
-    <h4>Import CURL command</h4>
-    <%= import_api_curl_command %>
-  </div>
-</div>
-<%= javascript_tag("$('#redmine_with_git_api').hide();") %>

data/app/views/redmine_with_git/_export.html.erb

@@ -1 +0,0 @@
-<%= link_to 'Export', export_redmine_with_git_path %>

data/app/views/redmine_with_git/index.html.erb

@@ -1,9 +0,0 @@
-<h2>Redmine With Git</h2>
-<h3>Export</h3>
-<%= render partial: 'export' %>
-<h3>Import</h3>
-<%= render partial: 'import' %>
-<% if Setting.rest_api_enabled? %>
-  <h3>API</h3>
-  <%= render partial: 'api' %>
-<% end %>