bootswatch_rails 3.2.0.20 → 3.2.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec4948d98e1a72f0a9de68f751ccbaeb889e7492
-  data.tar.gz: f068c5644a3c77789d12fd10c8676b6b274e0eb9
+  metadata.gz: 4be289e6c8a440064e497ac99541d16b600a3faf
+  data.tar.gz: 2c54b2608bc912dd4a8e083049acc2dbe21e3d46
 SHA512:
-  metadata.gz: 7b5cbe3a965052003a20f05aed4c61c86b2956057eaac23087ad162da60dbfd85478facff65f1a09fed6dae52f7294d8ee58a387b2e2d915fe07fcf6ab4b7f7c
-  data.tar.gz: 8106ce5b7364649b3604650027d9f642a37dd0fe7f4036ce16f17b6d721209648ef20da51cef3db913c7123f2b71f6249165d0a78cd51e0391f673c3e313c42f
+  metadata.gz: 304c7fbbd77765515879c7432189fd5831e3bab198638a9d5b18169e7163a0de59e37b67975faf95019c6ae6576739337d90f698dc3623efbf2efee180e28a75
+  data.tar.gz: 46d2b2d129e22ba7227fa60961220254996b6cbedde3e070865cbba5caa5f92b77344e0b4dcaa4507364e73a9927d46f2236a53af6c0ced74a6f064ef88d5972

data/lib/bootswatch_rails/version.rb

@@ -1,6 +1,6 @@
 module BootswatchRails
   BOOTSTRAP = "3.2.0"
-  VERSION = "3.2.0.20"
+  VERSION = "3.2.0.21"
   THEMES = [:amelia, :cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
   DEFAULT = 1
 end

data/lib/generators/bootswatch_rails/sorcery/templates/index.html.erb

@@ -29,7 +29,9 @@
           <br>
           <%%= link_to t('actions.edit'), [:edit, <%= name %>], class: 'btn btn-default btn-xs' %>
           <br>
-          <%%= link_to t('actions.destroy'), <%= name %>, method: :delete, data: { confirm: t('actions.confirm') }, class: 'btn btn-danger btn-xs' %>
+          <%%- if current_<%= name %>.status == :sysadm and <%= name %> != current_<%= name %> -%>
+            <%%= link_to t('actions.destroy'), <%= name %>, method: :delete, data: { confirm: t('actions.confirm') }, class: 'btn btn-danger btn-xs' %>
+          <%%- end -%>
         </td>
       </tr>
     <%% end %>

data/lib/generators/bootswatch_rails/sorcery/templates/show.html.erb

@@ -83,4 +83,6 @@
 
 <%%= link_to t('actions.edit'), [:edit, @<%= name %>], class: 'btn btn-primary' %>
 <%%= link_to t('actions.back.index'), <%= table_name %>_path, class: 'btn btn-default' %>
-<%%= link_to t('actions.destroy'), @<%= name %>, method: :delete, data: { confirm: t('actions.confirm') }, class: 'btn btn-danger' %>
+<%%- if current_<%= name %>.status == :sysadm and @<%= name %> != current_<%= name %> -%>
+  <%%= link_to t('actions.destroy'), @<%= name %>, method: :delete, data: { confirm: t('actions.confirm') }, class: 'btn btn-danger' %>
+<%%- end -%>

data/lib/generators/bootswatch_rails/sorcery/templates/sorcery.de.yml

@@ -1,5 +1,6 @@
 de:
   sorcery:
+    forbidden: "Diese Aktion ist nicht erlaubt."
     log_in: "Login"
     log_out: "Logout"
     sign_up: "Benutzerkonto anlegen"

data/lib/generators/bootswatch_rails/sorcery/templates/users_controller.rb

@@ -127,6 +127,10 @@ class <%= controller_name.camelize %> < ApplicationController
   # DELETE /<%= table_name %>/1
   # DELETE /<%= table_name %>/1.json
   def destroy
+    if @<%= name %> == current_<%= name %> or current_<%= name %>.status != :sysadm
+      redirect_to root_path, alert: t('sorcery.forbidden')
+      return
+    end
     @<%= name %>.destroy
     respond_to do |format|
       format.html { redirect_to <%= table_name %>_url, notice: t('results.deleted', name: t('activerecord.models.<%= name %>.one')) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootswatch_rails
 version: !ruby/object:Gem::Version
-  version: 3.2.0.20
+  version: 3.2.0.21
 platform: ruby
 authors:
 - Volker Wiegand
@@ -90,7 +90,6 @@ files:
 - lib/bootswatch_rails.rb
 - lib/bootswatch_rails/engine.rb
 - lib/bootswatch_rails/version.rb
-- lib/generators/bootswatch_rails/bootsy/bootsy_generator.rb
 - lib/generators/bootswatch_rails/carrierwave/carrierwave_generator.rb
 - lib/generators/bootswatch_rails/carrierwave/templates/carrierwave_migration.rb
 - lib/generators/bootswatch_rails/carrierwave/templates/document_uploader.rb

data/lib/generators/bootswatch_rails/bootsy/bootsy_generator.rb

@@ -1,46 +0,0 @@
-require 'rails/generators/active_record'
-
-module BootswatchRails
-  module Generators
-    class BootsyGenerator < ActiveRecord::Generators::Base
-      desc "Turn text_area(s) into bootsy_area(s)"
-      argument :name, type: :string,
-               desc: "The resource that will have bootsy_areas"
-      argument :columns, type: :array, banner: "COLUMN [...]",
-               desc: "The names of the text attributes to be converted"
-      class_option :before, type: :boolean, default: false,
-               desc: 'Add a line before generated text in model'
-      class_option :after, type: :boolean, default: false,
-               desc: 'Add a line after generated text in model'
-      class_option :permit, type: :boolean, default: true,
-               desc: 'Allow mass assignment for bootsy_image_gallery_id'
-      
-      def add_to_model
-        inject_into_class "app/models/#{name}.rb", class_name do
-          text = options.before? ? "\n" : ""
-          text << "  include Bootsy::Container\n"
-          text << "\n" if options.after?
-          text
-        end
-      end
-      
-      def add_to_permit
-        return unless options.permit?
-        text = ":bootsy_image_gallery_id"
-        file = "app/controllers/#{table_name}_controller.rb"
-        gsub_file file, /(permit\(.*)\)/, "\\1, #{text})"
-        # Special case: no previous permit
-        gsub_file file, /^(\s*params)\[:#{name}\]$/, "\\1.require(:#{name}).permit(#{text})"
-      end
-      
-      def add_to_view
-        file = "app/views/#{table_name}/_form.html.erb"
-        columns.each do |column|
-          gsub_file file, /(input :#{column}) /, "\\1, as: :bootsy, input_html: { rows: 10 } "
-        end
-      end
-      
-    end
-  end
-end
-