foreman_hosts 1.1.2 → 1.1.3

data/config/routes.rb

@@ -1,7 +1,7 @@
 Rails.application.routes.draw do
 
   namespace :foreman_hosts do
-  	match 'report_index', to: 'hosts#report_index'
+  	#match 'report_index', to: 'hosts#report_index'
     resources :syhostmodels
     resources :syhostmodeldetails
   end

data/lib/foreman_hosts/engine.rb

@@ -20,7 +20,7 @@ module ForemanHosts
 
         # Add permissions
         security_block :foreman_hosts do
-          permission :view_foreman_hosts, :'foreman_hosts/hosts' => [:report_index]
+
 
           permission :view_foreman_syhostmodels, :'foreman_hosts/syhostmodels' => [:index, :show, :auto_complete_search] 
           permission :new_foreman_syhostmodels, :'foreman_hosts/syhostmodels' => [:new, :create] 
@@ -29,13 +29,13 @@ module ForemanHosts
         end
 
         # Add a new role called 'Discovery' if it doesn't exist
-        role 'ForemanHosts', [:view_foreman_hosts, :view_foreman_syhostmodels, :new_foreman_syhostmodels, :edit_foreman_syhostmodels, :delete_foreman_syhostmodels]
+        role 'ForemanHosts', [:view_foreman_syhostmodels, :new_foreman_syhostmodels, :edit_foreman_syhostmodels, :delete_foreman_syhostmodels]
 
         # add menu entry
 
          sub_menu :top_menu, :export_menu, :caption=> N_('Export'), :after=> :infrastructure_menu do
           menu :top_menu, :level1, :caption=>N_('ExportTemplates'), :url_hash => { :controller => 'foreman_hosts/syhostmodels', :action => :index }
-          menu :top_menu, :level2, :caption=>N_('ExportHosts'), :url_hash => { :controller => 'foreman_hosts/hosts', :action => :report_index }
+          #menu :top_menu, :level2, :caption=>N_('ExportHosts'), :url_hash => { :controller => 'foreman_hosts/hosts', :action => :report_index }
          end
         # menu :top_menu, :template,
         #      url_hash: { controller: :'foreman_hosts/hosts', action: :new_action },

data/lib/foreman_hosts/version.rb

@@ -1,3 +1,3 @@
 module ForemanHosts
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_hosts
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -90,17 +90,11 @@ files:
 - app/views/foreman_hosts/syhostmodels/_list.html.erb
 - app/views/foreman_hosts/syhostmodels/_form.html.erb
 - app/views/foreman_hosts/syhostmodels/_sub.html.erb
-- app/views/foreman_hosts/hosts/export.xlsx.axlsx
-- app/views/foreman_hosts/hosts/report_index.html.erb
-- app/views/foreman_hosts/hosts/hosts/new_action.html.erb
 - app/assets/javascripts/jquery.battatech.excelexport.js
 - app/assets/javascripts/application.js
 - app/overrides/dashboard/index/sample_override.html.erb.deface
 - app/controllers/foreman_hosts/syhostmodeldetails_controller.rb
 - app/controllers/foreman_hosts/syhostmodels_controller.rb
-- app/controllers/foreman_hosts/hosts_controller.rb
-- app/helpers/concerns/foreman_hosts/hosts_helper_extensions.rb
-- app/models/concerns/foreman_hosts/hosts_extensions.rb
 - app/models/foreman_hosts/syhostmodeldetail.rb
 - app/models/foreman_hosts/syhostmodel.rb
 - bin/foreman-hosts

data/app/controllers/foreman_hosts/hosts_controller.rb

@@ -1,17 +0,0 @@
-module ForemanHosts
-  # Example: Plugin's HostsController inherits from Foreman's HostsController
-  class HostsController < ::HostsController
-    # change layout if needed
-    #layout 'foreman_hosts/layouts/new_layout'
-
-    def report_index
-      @fact_values = FactValue.all
-      @fact_names = FactName.all
-      @hosts = Host.all
-      respond_to do |format|
-        format.html # index.html.erb
-        format.json { render json: @hosts }
-      end
-    end    
-  end
-end

data/app/helpers/concerns/foreman_hosts/hosts_helper_extensions.rb

@@ -1,20 +0,0 @@
-module ForemanHosts
-  module HostsHelperExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      # execute callbacks
-    end
-
-    # create or overwrite instance methods...
-    def instance_method_name
-    end
-
-    def get_fact_value(host,name)
-      fact_value = FactValue.where(host_id: host.id, fact_name_id: name.id)
-      if fact_value.first.present?
-        return fact_value.first.value
-      end
-    end
-  end
-end

data/app/models/concerns/foreman_hosts/hosts_extensions.rb

@@ -1,19 +0,0 @@
-module ForemanHosts
-  module HostExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      # execute callbacks
-    end
-
-    # create or overwrite instance methods...
-    def instance_method_name
-    end
-
-    module ClassMethods
-      # create or overwrite class methods...
-      def class_method_name
-      end
-    end
-  end
-end

data/app/views/foreman_hosts/hosts/export.xlsx.axlsx

@@ -1,130 +0,0 @@
-wb = xlsx_package.workbook
-wb.add_worksheet(name: "Hosts") do |sheet|
-  sheet.add_row [
-    "name",
-    "last_compile",
-    "last_report",
-    "updated_at",
-    "created_at",
-    "root_pass",
-    "architecture_id",
-    "operatingsystem_id",
-    "environment_id",
-    "ptable_id",
-    "medium_id",
-    "build",
-    "comment",
-    "disk",
-    "installed_at",
-    "model_id",
-    "roup_id",
-    "owner_id",
-    "owner_type",
-    "enabled ",
-    "puppet_ca_proxy_id ",
-    "managed ",
-    "use_image ",
-    "image_file ",
-    "uuid ",
-    "compute_resource_id ",
-    "puppet_proxy_id ",
-    "certname ",
-    "image_id ",
-    "organization_id ",
-    "location_id ",
-    "type ",
-    "otp ",
-    "realm_id ",
-    "compute_profile_id ",
-    "provision_method ",
-    "grub_pass ",
-    "global_status ",
-    "lookup_value_matcher"
-  ]
-
-  
-  @hosts.each do |host|
-
-      expet_name =  host.name rescue ""
-      expet_last_compile =   host.last_compile rescue ""
-      expet_last_report =  host.last_report rescue ""
-      expet_updated_at=  host.updated_at rescue ""
-      expet_created_ate =  host.created_at rescue ""
-      expet_root_pass =  host.root_pass rescue ""
-      expet_architecture_id =  host.architecture.name rescue ""
-      expet_operatingsystem_id =  host.operatingsystem.name rescue ""
-      expet_environment_id=  host.environment.name rescue ""
-      expet_ptable_id =  host.ptable.name rescue ""
-      expet_medium_id =  host.medium.name rescue ""
-      expet_build =  host.build rescue ""
-      expet_comment =  host.comment rescue ""
-      expetdisk =  host.disk rescue ""
-      expet_installed_at =  host.installed_at rescue ""
-      expet_model_id =  host.model.name rescue ""
-      expet_hostgroup_id =  host.hostgroup.name rescue ""
-      expet_owner_id =   host.owner.name rescue ""
-      expet_owner_type =  host.owner_type rescue ""
-      expet_enabled=    host.enabled  rescue ""
-      expet_puppet_ca_proxy_id =    host.puppet_ca_proxy.name  rescue ""
-      expet_managed =      host.managed  rescue ""
-      expet_use_image =      host.use_image  rescue ""
-      expet_image_file =      host.image_file  rescue ""
-      expet_uuid =       host.uuid  rescue ""
-      expet_compute_resource_id =       host.compute_resource.name  rescue ""
-      expet_puppet_proxy_id =      host.puppet_proxy.name  rescue ""
-      expet_certname =      host.certname  rescue ""
-      expet_image_id =       host.image_id  rescue ""
-      expet_organization_id =      host.organization.name rescue ""
-      expet_location_id =      host.location.name  rescue ""
-      expet_type=     host.type  rescue ""
-      expet_otp =     host.otp  rescue ""
-      expet_realm_id =      host.realm.name  rescue ""
-      expet_compute_profile_id =      host.compute_profile.name  rescue ""
-      expet_provision_method =      host.provision_method  rescue ""
-      expet_grub_pass =     host.grub_pass  rescue ""
-      expet_global_status =      host.global_status  rescue ""
-      expet_lookup_value_matcher =       host.lookup_value_matcher rescue ""
-
-    sheet.add_row [
-        expet_name,
-        expet_last_compile,
-        expet_last_report,
-        expet_updated_at=  host.updated_at rescue "",
-        expet_created_ate,
-        expet_root_pass,
-        expet_architecture_id,
-        expet_operatingsystem_id,
-        expet_environment_id,
-        expet_ptable_id,
-        expet_medium_id,
-        expet_build,
-        expet_comment,
-        expetdisk,
-        expet_installed_at,
-        expet_model_id,
-        expet_hostgroup_id,
-        expet_owner_id,
-        expet_owner_type,
-        expet_enabled=    host.enabled  rescue "",
-        expet_puppet_ca_proxy_id,
-        expet_managed,
-        expet_use_image,
-        expet_image_file,
-        expet_uuid,
-        expet_compute_resource_id,
-        expet_puppet_proxy_id,
-        expet_certname,
-        expet_image_id,
-        expet_organization_id,
-        expet_location_id,
-        expet_type=     host.type  rescue "",
-        expet_otp,
-        expet_realm_id,
-        expet_compute_profile_id,
-        expet_provision_method,
-        expet_grub_pass,
-        expet_global_status,
-        expet_lookup_value_matcher
-    ]
-  end
-end

data/app/views/foreman_hosts/hosts/hosts/new_action.html.erb

@@ -1 +0,0 @@
-Welcome to <b>ForemanHosts</b>

data/app/views/foreman_hosts/hosts/report_index.html.erb

@@ -1,257 +0,0 @@
-<div class="four wide right column">
-        <button class='btn btn-info' type='button'><a href="javascript:void(0);" class="ui green button icon mini" id="btnExport" onclick="export_excel();">Export</a></button>
-
-</div>
-<%= javascript "jquery.cookie", "host_checkbox" %>
-<% title header ||= "" %>
-
-<table class="table table-bordered table-striped table-condensed" id="tblExport">
-  <thead>
-    <tr>
-      <th class=''><%= sort :name, :as => _('Name') %></th>
-      <% fact_name_no1 = 1 %>
-     <% @fact_names.each do |fact_name| %>
-
-      <th id="td<%= fact_name_no1 %>"><%= fact_name.name %>
-      <br />
-      <button  type='button'><a href="javascript:void(0);"  onclick="DeleteSignColumn(<%= fact_name_no1 %>);"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></a></button></th>
-            <% fact_name_no1 += 1 %>
-     <% end %>
-    </tr>
-  </thead> 
-  <tbody>
-    <% @hosts.each do |host| %>
-      <tr>
-        <td class='ellipsis'><%= name_column(host) %></td>
-
-        <% @fact_names.each do |fact_name| %>
-          <td>
-            <%= FactValue.where(host_id: host.id, fact_name_id: fact_name.id).last.value rescue nil%>
-          </td>
-        <% end %>
-      
-
-
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-
-
-
-
-
-<script type="text/javascript">
-  function export_excel(){
-    var uri = $("#tblExport").battatech_excelexport({
-                containerid: "tblExport",
-                datatype: 'table',
-                returnUri: true
-            });
-    $("#btnExport").attr('download', 'hosts.xlsx').attr('href', uri).attr('target', '_blank');
-  }
-
-  function DeleteSignColumn(tid) {
-    var tab = document.getElementById("tblExport");
-    var columnLength = tab.rows[0].cells.length;
-    var tr1 = tab.rows[0];
-    var columnId = 0;
-    tid= "td" + tid
-      for(var j=0;j<tr1.cells.length;j++)//取得第几行下面的td个数，再次循环遍历该行下面的td元素
-      {
-         var cell = tr1.cells[j];//获取某行下面的某个td元素
-         if (cell.id == tid) {
-            columnId = columnId + j;
-         }
-        }
-    //删除指定单元格
-    if (columnId > 0){
-      for (var i = 0; i < tab.rows.length; i++) {
-          tab.rows[i].deleteCell(columnId);
-      }
-    }
-
-}
-/*
- * jQuery Client Side Excel Export Plugin Library
- * http://www.battatech.com/
- *
- * Copyright (c) 2013 Batta Tech Private Limited
- * Licensed under https://github.com/battatech/battatech_excelexport/blob/master/LICENSE.txt
- */
-
-(function ($) {
-    var $defaults = {
-        containerid: null
-        , datatype: 'table'
-        , dataset: null
-        , columns: null
-        , returnUri: false
-        , worksheetName: "Sheet1"
-        , encoding: "utf-8"
-    };
-
-    var $settings = $defaults;
-
-    $.fn.battatech_excelexport = function (options) {
-        $settings = $.extend({}, $defaults, options);
-
-        var gridData = [];
-        var excelData;
-
-        return Initialize();
-
-        function Initialize() {
-            var type = $settings.datatype.toLowerCase();
-
-            BuildDataStructure(type);
-
-            switch (type) {
-                case 'table':
-                    excelData = Export(ConvertFromTable());
-                    break;
-                case 'json':
-                    excelData = Export(ConvertDataStructureToTable());
-                    break;
-                case 'xml':
-                    excelData = Export(ConvertDataStructureToTable());
-                    break;
-                case 'jqgrid':
-                    excelData = Export(ConvertDataStructureToTable());
-                    break;
-            }
-
-            if ($settings.returnUri) {
-                return excelData;
-            }
-            else {
-                window.open(excelData);
-            }
-        }
-
-        function BuildDataStructure(type) {
-            switch (type) {
-                case 'table':
-                    break;
-                case 'json':
-                    gridData = $settings.dataset;
-                    break;
-                case 'xml':
-                    $($settings.dataset).find("row").each(function (key, value) {
-                        var item = {};
-
-                        if (this.attributes != null && this.attributes.length > 0) {
-                            $(this.attributes).each(function () {
-                                item[this.name] = this.value;
-                            });
-
-                            gridData.push(item);
-                        }
-                    });
-                    break;
-                case 'jqgrid':
-                    $($settings.dataset).find("rows > row").each(function (key, value) {
-                        var item = {};
-
-                        if (this.children != null && this.children.length > 0) {
-                            $(this.children).each(function () {
-                                item[this.tagName] = $(this).text();
-                            });
-
-                            gridData.push(item);
-                        }
-                    });
-                    break;
-            }
-        }
-
-        function ConvertFromTable() {
-            var result = $('<div>').append($('#' + $settings.containerid).clone()).html();
-            return result;
-        }
-
-        function ConvertDataStructureToTable() {
-            var result = "<table>";
-
-            result += "<thead><tr>";
-            $($settings.columns).each(function (key, value) {
-                if (this.ishidden != true) {
-                    result += "<th";
-                    if (this.width != null) {
-                        result += " style='width: " + this.width + "'";
-                    }
-                    result += ">";
-                    result += this.headertext;
-                    result += "</th>";
-                }
-            });
-            result += "</tr></thead>";
-
-            result += "<tbody>";
-            $(gridData).each(function (key, value) {
-                result += "<tr>";
-                $($settings.columns).each(function (k, v) {
-                    if (value.hasOwnProperty(this.datafield)) {
-                        if (this.ishidden != true) {
-                            result += "<td";
-                            if (this.width != null) {
-                                result += " style='width: " + this.width + "'";
-                            }
-                            result += ">";
-                            result += value[this.datafield];
-                            result += "</td>";
-                        }
-                    }
-                });
-                result += "</tr>";
-            });
-            result += "</tbody>";
-
-            result += "</table>";
-            return result;
-        }
-
-        function Export(htmltable) {
-            var excelFile = "<html xmlns:o='urn:schemas-microsoft-com:office:office' xmlns:x='urn:schemas-microsoft-com:office:excel' xmlns='http://www.w3.org/TR/REC-html40'>";
-            excelFile += "<head>";
-            excelFile += '<meta http-equiv="Content-type" content="text/html;charset=' + $defaults.encoding + '" />';
-            excelFile += "<!--[if gte mso 9]>";
-            excelFile += "<xml>";
-            excelFile += "<x:ExcelWorkbook>";
-            excelFile += "<x:ExcelWorksheets>";
-            excelFile += "<x:ExcelWorksheet>";
-            excelFile += "<x:Name>";
-            excelFile += "{worksheet}";
-            excelFile += "</x:Name>";
-            excelFile += "<x:WorksheetOptions>";
-            excelFile += "<x:DisplayGridlines/>";
-            excelFile += "</x:WorksheetOptions>";
-            excelFile += "</x:ExcelWorksheet>";
-            excelFile += "</x:ExcelWorksheets>";
-            excelFile += "</x:ExcelWorkbook>";
-            excelFile += "</xml>";
-            excelFile += "<![endif]-->";
-            excelFile += "</head>";
-            excelFile += "<body>";
-            excelFile += htmltable.replace(/"/g, '\'');
-            excelFile += "</body>";
-            excelFile += "</html>";
-
-            var uri = "data:application/vnd.ms-excel;base64,";
-            var ctx = { worksheet: $settings.worksheetName, table: htmltable };
-
-            return (uri + base64(format(excelFile, ctx)));
-        }
-
-        function base64(s) {
-            return window.btoa(unescape(encodeURIComponent(s)));
-        }
-
-        function format(s, c) {
-            return s.replace(/{(\w+)}/g, function (m, p) { return c[p]; });
-        }
-    };
-})(jQuery);
-
-</script>