cm-admin 2.1.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad9a43a0763e747a7c11a94d719d2fc9ec924f499a4081057df26eb37fd91392
-  data.tar.gz: 474b8cc9a8f2c883bce94c1529527ba9d4ea550c2aa43e28cd233ab7bb96eb15
+  metadata.gz: c68983444fcc76457f2f9c67844a6518d39a6e1a9f4656d5e869188d517ae1b7
+  data.tar.gz: 6dda9b94f136c52dba561e65b31db92b4a2b9036f078d2d1aaf66d1c972a49ea
 SHA512:
-  metadata.gz: 9f629c58db6ef60d36eb10244efb1bbe1298abdb96a49ea8914aea659c7912f0835f067a9573a006483877af0205d87e2fe19fbe97fa691bf826854d6e771bfc
-  data.tar.gz: '028f51fa078b58bf8715590e269e72fe6d27a814c7a365b5a08b70641f3617a7e6fa026a8a06da85d1fd826165c48501e9abe03656ef0d2e012a61d92446dcc2'
+  metadata.gz: 3fb734f37af1c3a6204c6b5e6aa04530410cafd8f1bb208457ae84bbf452a1b2811154acab9a7b330bfad42d7ded483f9c58c7a0f51a5c490ca7ad77a7ce5679
+  data.tar.gz: 3e27a73e792d282d2d8f334716c7a56692ed3f11af67eddcbccfe529f8fc117833d6aee191673b3cf44edc4af5b768d8ce3b03264e4ac366cf5560f6a348b9ed

data/.yardopts

@@ -1,6 +1,4 @@
 lib/cm_admin/models/dsl_method.rb
 -
-docs/ShowHideContent.md
-docs/ListingSelectTwoItems.md
-docs/ListingSelectTwoAjax.md
-docs/AddingAlert.md
+docs/**.md
+docs/**.rb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cm-admin (2.1.1)
+    cm-admin (2.1.3)
       caxlsx_rails
       cocoon (~> 1.2.15)
       csv-importer (~> 0.8.2)

data/README.md

@@ -39,6 +39,8 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`.
 
+Any markdown and ruby file added in `docs/` folder will be auto added in yard docs.
+
 ## Deployment
 
 To release a new version of the Gem you can use Github Actions.

data/app/assets/javascripts/cm_admin/form_validation.js

@@ -16,6 +16,7 @@ $(document).on("click", '[data-behaviour="form_submit"]', function (e) {
       submit.push(true);
     }
   });
+
   $("." + form_class + " select.required").each(function () {
     $(this).removeClass("is-invalid");
     let selected_value = $(this).val();
@@ -49,3 +50,10 @@ $(document).on("click", '[data-behaviour="form_submit"]', function (e) {
     return $('[data-behaviour="form_submit"]').button("loading");
   }
 });
+
+$(document).on("click", '[data-behaviour="discard_form"]', function (e) {
+  e.preventDefault();
+  const form = $(this).closest("form");
+  form[0].reset();
+  window.history.back();
+});

data/app/assets/stylesheets/cm_admin/base/form.scss

@@ -114,3 +114,7 @@
   border: 1px solid $gray-300;
   background-color: $gray-100;
 }
+
+.discard-form {
+  margin-left: 16px;
+}

data/app/models/cm_permission.rb

@@ -1,23 +1,22 @@
 class CmPermission < ApplicationRecord
-  
   after_create :create_hidden_permission
   after_destroy :destroy_hidden_permission
 
-  validates :action_name, presence: true, uniqueness: {scope: :ar_model_name}
+  validates :action_name, presence: true, uniqueness: { scope: %i[ar_model_name cm_role_id] }
 
   def create_hidden_permission
     if action_name == 'new'
-      CmPermission.where(action_name: 'create', ar_model_name: ar_model_name, cm_role_id: cm_role_id).first_or_create
+      CmPermission.where(action_name: 'create', ar_model_name:, cm_role_id:).first_or_create
     elsif action_name == 'edit'
-      CmPermission.where(action_name: 'update', ar_model_name: ar_model_name, cm_role_id: cm_role_id).first_or_create
+      CmPermission.where(action_name: 'update', ar_model_name:, cm_role_id:).first_or_create
     end
   end
 
   def destroy_hidden_permission
     if action_name == 'new'
-      CmPermission.where(action_name: 'create', ar_model_name: ar_model_name, cm_role_id: cm_role_id).first&.destroy
+      CmPermission.where(action_name: 'create', ar_model_name:, cm_role_id:).first&.destroy
     elsif action_name == 'edit'
-      CmPermission.where(action_name: 'update', ar_model_name: ar_model_name, cm_role_id: cm_role_id).first&.destroy
+      CmPermission.where(action_name: 'update', ar_model_name:, cm_role_id:).first&.destroy
     end
   end
 end

data/app/views/cm_admin/roles/permissions.html.slim

@@ -34,4 +34,4 @@
                               = select_tag(:policy_scope_name, options_for_select(model.policy_scopes.map{|policy_hash| [policy_hash[:display_name], policy_hash[:scope_name]]}, permission&.scope_name), {name: "role_permission[#{model.name}][#{action.name}][scope_name]", class: 'select-2', id: "policy-scope-#{model.name}-#{action.name}"})
                 div
         = f.submit 'Save Changes', class: "btn-cta"
-        = link_to 'Discard', cm_admin.send('cm_role_index_path'), class: "btn btn-outline-dark ml-10"
+        = link_to 'Discard', cm_admin.send('cm_role_index_path'), class: "btn-secondary ml-10"

data/lib/cm_admin/version.rb

@@ -1,3 +1,3 @@
 module CmAdmin
-  VERSION = '2.1.1'
+  VERSION = '2.1.3'
 end

data/lib/cm_admin/view_helpers/form_helper.rb

@@ -161,6 +161,7 @@ module CmAdmin
           concat split_form_into_section(resource, form_obj, entities)
           concat tag.br
           concat form_obj.submit 'Save', class: 'btn-cta', data: { behaviour: 'form_submit', form_class: "cm_#{form_obj.object.class.name.downcase}_form" }
+          concat button_tag 'Discard', class: 'btn-secondary discard-form', data: { behaviour: 'discard_form' }
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cm-admin
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Michael
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-13 00:00:00.000000000 Z
+date: 2024-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails