padma-assets 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6c0e4404edbb4641adb4be29c775a4510002c70
-  data.tar.gz: c7b33edbea9a3a408280f2a099600595c194fe2c
+  metadata.gz: 856bdd472b827470988adcaee5e9ff2418d97ee2
+  data.tar.gz: 723a3d940d839bf9ecfd50abfa4a4e2e59454337
 SHA512:
-  metadata.gz: 958cbbe5c7e1a584bce3a16877ae789f978cfb33d1ea74ea995fabf702d204341f7ead231a9e91c9b139e22ccb2d1281c3e6e1cb49e9d480c088fd6ee9f61954
-  data.tar.gz: 63d3768c45fc19e99b1645de605e7cf36e6428dcf71ff7396bee2e09c6f6b8b4e8048f4ea93117845e5c1d36ee3b2ff0099c226983dfcac7763c896041311066
+  metadata.gz: 40eb5004bded6ed069cb9c0db4e2a174db41e9d8c3a8693f377b3240a594b11906fe01ffa395109ffebad90ac1b59b93d487c43dce196a7c7d92abf2fd1459b7
+  data.tar.gz: 3ead87d490809153a6be575295583618681f064e4c6814a36625f6bd05b2ac450530bf30e23076eeb5618d4dd4bd6b34ed3fbf0c95f5959cd489c0c2e8ab609b

data/app/abilities/general_ability.rb

@@ -3,7 +3,10 @@ class GeneralAbility
 
   def initialize(user)
     if alpha?(user)
-      can :manage, :mailchimp
+      can :see, :mailchimp
+      if petal_enabled?(user,'mailchimp')
+        can :configure, :mailchimp
+      end
       can :manage, :planning
     end
 
@@ -34,6 +37,10 @@ class GeneralAbility
       user.current_account.padma
     end
   end
+
+  def petal_enabled?(user,petal_name)
+    petal_name.in?(padma_account(user).enabled_petals||[])
+  end
   
   def alpha?(user)
     user.account_tester_level == 'alpha'

data/app/views/layouts/_mailing_menu.html.erb

@@ -2,6 +2,6 @@
 <li><%= link_to t('header-menu.mailing.triggers'), "#{APP_CONFIG['mailing-url']}/triggers" %></li>
 <li><%= link_to t('header-menu.mailing.scheduled_mails_all'), "#{APP_CONFIG['mailing-url']}/scheduled_mails/history" %></li>
 <li><%= link_to t('header-menu.mailing.scheduled_mails_future'), "#{APP_CONFIG['mailing-url']}/scheduled_mails/pending" %></li>
-<% if 'mailchimp'.in?(current_user.current_account.padma.enabled_petals||[]) -%>
+<% if can? :configure, :mailchimp -%>
   <li><%= link_to t('header-menu.mailing.mailchimp_configuration'), "#{APP_CONFIG['mailing-url']}/mailchimp/configuration" %></li>
 <% end -%>

data/app/views/layouts/_module_box.html.erb

@@ -50,7 +50,7 @@
             <% if can?(:manage,:planning) -%>
               <li><%= link_to t('header-menu.modules.planning'), APP_CONFIG['planning-url'] %></li>
             <% end -%>
-            <% if can?(:manage, :mailchimp) -%>
+            <% if can?(:see, :mailchimp) -%>
               <li><%= link_to t('header-menu.modules.mailchimp_integration'), "#{APP_CONFIG['mailing-url']}/mailchimp/subscription" %></li>
             <% end -%>
             <% if can?(:manage, :derose_events) -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padma-assets
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Dwayne Macgowan