Browse Source

Maintenance: Update commands for package view to use rake and fix user for package installations.

Rolf Schmidt 2 years ago
parent
commit
d6a5ff11d6

+ 5 - 3
app/assets/javascripts/app/controllers/package.coffee

@@ -15,8 +15,9 @@ class Package extends App.ControllerSubContent
       url:   "#{@apiPath}/packages",
       url:   "#{@apiPath}/packages",
       processData: true,
       processData: true,
       success: (data) =>
       success: (data) =>
-        @packages = data.packages
-        @commands = data.commands
+        @packages             = data.packages
+        @package_installation = data.package_installation
+        @local_gemfiles       = data.local_gemfiles
         @render()
         @render()
       )
       )
 
 
@@ -35,7 +36,8 @@ class Package extends App.ControllerSubContent
     @html App.view('package')(
     @html App.view('package')(
       head:     __('Dashboard')
       head:     __('Dashboard')
       packages: @packages
       packages: @packages
-      commands: @commands
+      package_installation: @package_installation
+      local_gemfiles: @local_gemfiles
     )
     )
 
 
   action: (e) ->
   action: (e) ->

+ 13 - 2
app/assets/javascripts/app/views/package.jst.eco

@@ -11,8 +11,19 @@
   <p>
   <p>
     <%- @T('After installing, updating, or uninstalling packages the following commands need to be executed on the server:') %>
     <%- @T('After installing, updating, or uninstalling packages the following commands need to be executed on the server:') %>
     <ul>
     <ul>
-    <% for command in @commands: %>
-      <li><code>zammad> <%- command %></code></li>
+    <% if @package_installation: %>
+      <% if @local_gemfiles: %>
+      <li><code>root> zammad config:set BUNDLE_DEPLOYMENT=0</code></li>
+      <li><code>root> zammad run bundle install --no-deployment</code></li>
+      <% end %>
+      <li><code>root> zammad run rake zammad:package:migrate</code></strong></li>
+      <li><code>root> zammad run rake assets:precompile</code></strong></li>
+    <% else: %>
+      <% if @local_gemfiles: %>
+      <li><code>zammad> bundle install</code></li>
+      <% end %>
+      <li><code>zammad> rake zammad:package:migrate</code></strong></li>
+      <li><code>zammad> rake assets:precompile</code></strong></li>
     <% end %>
     <% end %>
       <li><code>root> systemctl restart zammad</code></li>
       <li><code>root> systemctl restart zammad</code></li>
     </ul>
     </ul>

+ 3 - 7
app/controllers/packages_controller.rb

@@ -5,14 +5,10 @@ class PackagesController < ApplicationController
 
 
   # GET /api/v1/packages
   # GET /api/v1/packages
   def index
   def index
-    packages = Package.all.order('name')
-    commands = ['rails zammad:package:migrate', 'rails assets:precompile']
-    if File.exist?('/usr/bin/zammad')
-      commands.map! { |s| "zammad run #{s}" }
-    end
     render json: {
     render json: {
-      packages: packages,
-      commands: commands
+      packages:             Package.all.order('name'),
+      package_installation: File.exist?('/usr/bin/zammad'),
+      local_gemfiles:       Dir['Gemfile.local.*'].present?
     }
     }
   end
   end