wobauth 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d5e1f219efe48cd29c469eb5d3ed59a25b1fc67475bfae58a264b0e7c99ad1a
-  data.tar.gz: 8bdbdcfd1a077031af6b1877467adfa058ed08ab45f9dbe21e35948a12e9d6e9
+  metadata.gz: 2500bebf49f08404ae7184155a6f01f82ca0aec3851932e02475fb17d58e5782
+  data.tar.gz: a09aa25804d3f786183378606d1335e1681e1830c0f4bff0ce0fea87b1cc8e0a
 SHA512:
-  metadata.gz: a0c43642e78f30c47ea97a380079bc544c9bda95efa28a143a9c446bc140e42121e6e80c6e1a06675a44a2112ead2f4fa651b0c5e57a6e7f4222407e5a9e03a0
-  data.tar.gz: fd817e4f7019a3fa07bdb8340f096fb307870ba7e8324df128b65596e5fc11b12a01683b1396d4e79fdbae6c3747da9a5c542c9b6498ecba9ddb4d608ab0680b
+  metadata.gz: 705ff44fd69b90cbb7410b5aaf6fb101c9ccbd9680a8250c57e595c570957f43c21fb99c7df0b57179196e1172d40628dd64d1af52a3595ad7fb4de31b5e5ab8
+  data.tar.gz: 1e01f8526e8615957dae51d02d1de285a4e17b498fdbf2793a98d50da0006da887175ce93893d37202a8f0fbb6581f3ea45e99492e714e16c95f83f84701ecb4

data/app/assets/javascripts/wobauth/authorities.js.coffee

@@ -4,14 +4,14 @@
 
 # - start with given values
 auth_types = $('#authority_authorizable_type').find("option:selected").val()
-$('#authority_authorizable_id optgroup').find('option').addBack().hide()
-$("#authority_authorizable_id optgroup[label=\"#{auth_types}\"]").find('option').addBack().show()
+$('#authority_authorizable_id optgroup').find('option').addBack().attr("disabled", true)
+$("#authority_authorizable_id optgroup[label=\"#{auth_types}\"]").find('option').addBack().attr("disabled", false)
 
 # - redisplay on change
 $(document).on('click', '#authority_authorizable_type', ->
   type = $(this).find("option:selected").val()
-  $('#authority_authorizable_id optgroup').find('option').addBack().hide()
-  $("#authority_authorizable_id optgroup[label=\"#{type}\"]").find('option').addBack().show()
+  $('#authority_authorizable_id optgroup').find('option').addBack().attr("disabled", true)
+  $("#authority_authorizable_id optgroup[label=\"#{type}\"]").find('option').addBack().attr("disabled", false)
 )
 
 #
@@ -20,12 +20,12 @@ $(document).on('click', '#authority_authorizable_type', ->
 
 # - start with given values
 authfor_type = $('#authority_authorized_for_type').find("option:selected").val()
-$('#authority_authorized_for_id optgroup').find('option').addBack().hide()
-$("#authority_authorized_for_id optgroup[label=\"#{authfor_type}\"]").find('option').addBack().show()
+$('#authority_authorized_for_id optgroup').find('option').addBack().attr("disabled", true)
+$("#authority_authorized_for_id optgroup[label=\"#{authfor_type}\"]").find('option').addBack().attr("disabled", false)
 
 # - redisplay on change
 $(document).on('click', '#authority_authorized_for_type', ->
   type = $(this).find("option:selected").val()
-  $('#authority_authorized_for_id optgroup').find('option').addBack().hide()
-  $("#authority_authorized_for_id optgroup[label=\"#{type}\"]").find('option').addBack().show()
+  $('#authority_authorized_for_id optgroup').find('option').addBack().attr("disabled", true)
+  $("#authority_authorized_for_id optgroup[label=\"#{type}\"]").find('option').addBack().attr("disabled", false)
 )

data/app/helpers/wobauth/application_helper.rb

@@ -1,19 +1,7 @@
 module Wobauth
   module ApplicationHelper
     include Wobapphelpers::Helpers::All
-
-    def polymorphic_selector(form, poly, types, group_method = :all)
-      msg = ""
-      # -- object available?
-      if form.object.send(poly).present?
-	msg += poly_type_display(form, poly)
-	msg += poly_id_select(form, poly, form.object.send("#{poly}_type"), :all)
-      else
-	msg += poly_type_select(form, poly, types)
-	msg += poly_id_select(form, poly, types, group_method)
-      end
-      msg.html_safe
-    end
+    include Wobapphelpers::Helpers::PolymorphicHelper
 
     def navigation_admin_links
       render partial: 'wobauth/shared/admin'
@@ -29,25 +17,5 @@ module Wobauth
       end
     end
 
-  private
-
-    def poly_type_select(f, poly, types)
-      f.input "#{poly}_type".to_sym, collection: types,
-              label_method: lambda {|x| t('activerecord.models.' + x.underscore)}
-    end
-
-    def poly_type_display(f, poly)
-     f.input("#{poly}_type".to_sym, collection: Array(f.object.send("#{poly}_type")),
-       label_method: lambda {|x| t('activerecord.models.' + x.underscore)},
-       disabled: true) +
-     f.hidden_field("#{poly}_type".to_sym, value: f.object.send("#{poly}_type"))
-    end
-
-    def poly_id_select(f, poly, types, group_method)
-      collections = Array(types).map {|t| t.constantize}
-      f.input "#{poly}_id".to_sym, collection: collections,
-                 as: :grouped_select, group_method: group_method
-    end
-
   end
 end

data/app/views/wobauth/authorities/_form.html.erb

@@ -11,12 +11,16 @@
     <%= polymorphic_selector(f,
                              'authorizable',
                               Wobauth.authorizable_types,
-                              Wobauth.authorizable_group_method) %>
+                              Wobauth.authorizable_group_method,
+                              {class: 'select2'}) 
+     %>
     <%= f.association :role %>
     <%= polymorphic_selector(f,
                              'authorized_for',
                              Wobauth.authorized_for_types,
-                             Wobauth.authorized_for_group_method) %>
+                             Wobauth.authorized_for_group_method,
+                              {class: 'select2'}) 
+     %>
 
     <%= f.input :valid_from, as: :string, class: 'datepicker'
      %>

data/app/views/wobauth/authorities/show.html.erb

@@ -3,33 +3,33 @@
     <h4><%= t('activerecord.models.wobauth/authority') %></h4>
   </div>
   <div class="card-body">
-    <table class="table table-bordered table-hover autowidth">
+    <table class="table table-sm table-borderless">
       <tr>
-	<th><%= t('attributes.authorizable')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.authorizable')%>:</th>
 	<td><%= @authority.authorizable %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.authorizable_type')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.authorizable_type')%>:</th>
 	<td><%= @authority.authorizable_type %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.role')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.role')%>:</th>
 	<td><%= @authority.role %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.authorized_for')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.authorized_for')%>:</th>
 	<td><%= @authority.authorized_for %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.authorized_for_type')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.authorized_for_type')%>:</th>
 	<td><%= @authority.authorized_for_type %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.valid_from')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.valid_from')%>:</th>
 	<td><%= @authority.valid_from %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.valid_until')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.valid_until')%>:</th>
 	<td><%= @authority.valid_until %></td>
       </tr>
     </table>

data/app/views/wobauth/memberships/show.html.erb

@@ -3,17 +3,17 @@
     <h4><%= t('attributes.membership') %></h4>
   </div>
   <div class="card-body">
-    <table class="table table-bordered table-hover autowidth">
+    <table class="table table-sm table-borderless ">
       <tr>
-	<th><%= t('attributes.user')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.user')%>:</th>
 	<td><%= @membership.user %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.group')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.group')%>:</th>
 	<td><%= @membership.group %></td>
       </tr>
       <tr>
-	<th><%= t('attributes.auto')%>:</th>
+	<th class="w-25 text-right"><%= t('attributes.auto')%>:</th>
 	<td><%= @membership.auto %></td>
       </tr>
     </table>

data/lib/wobauth/version.rb

@@ -1,4 +1,4 @@
 module Wobauth
-  VERSION = "5.0.1".freeze
-  RELEASEDATE = "2020-01-22".freeze
+  VERSION = "5.0.2".freeze
+  RELEASEDATE = "2020-04-05".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wobauth
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Wolfgang Barth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: wobaduser
   requirement: !ruby/object:Gem::Requirement