padma-assets 0.3.25 → 0.3.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecfa5c8b5b53112a3b4052bfb1bd28fbea1c5ebff6e19b6587e21a7d1cdf6edf
-  data.tar.gz: 1339d0d72bc145fbfd98f43fe8ca9b70f358dde372ed5432f0feead3d6c3496d
+  metadata.gz: c9294bfe13de94a0293d69f6e6254eb20d2de98b47b9c90e82f4ddd1b3e81460
+  data.tar.gz: 8da9c3487a95600ba6e25373e9250a5806f9b7e505e2b95eddb130e2ddb842f4
 SHA512:
-  metadata.gz: 3a3ee35e3ea450288c5f439743fbc80504d7318a6c227fa055a632f0a40f102861d89175681fd2a750c73ddb743c86dc98eacec14ee0161dbf41ed250e97837e
-  data.tar.gz: a45598ccbc7ee78dbf15352e0fdd341f11c49a6fe6b1c65de3b68f2f28af245dc65b2ff32a5e2bbd48b32593a8f61ba5add6a374000aa53f7ad37d324925abeb
+  metadata.gz: e05eaa5e1b9cf0e9b3010936dfd0029dde4d819b01fd41e634d009becb6e743d0a3ef54db8a74448cf3e690445a4bdec0c46ea991422cf1fd475a991e3e34770
+  data.tar.gz: a3f12090a19f933bb514b1d120e59c9587875540b0990e8146d8c1464042fb905ffc4ab816aac24213513401f37065d7ea1bf2af5e976873b7202c33cf84248d

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

@@ -1,5 +1,4 @@
-<% local_mailing = current_user.current_account.respond_to?(:padma)? current_user.current_account.padma.local_mailing : current_user.current_account.local_mailing %>
-<% mailing_url = (local_mailing)? "#{APP_CONFIG['crm-url']}/mailing" : APP_CONFIG['mailing-url'] %>
+<% mailing_url = "#{APP_CONFIG['crm-url']}/mailing" %>
 <li><%= link_to t('header-menu.mailing.templates'), "#{mailing_url}/templates" %></li>
 <li><%= link_to t('header-menu.mailing.addresses'), "#{mailing_url}/addresses" %></li>
 <li><%= link_to t('header-menu.mailing.triggers'), "#{mailing_url}/triggers" %></li>

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

@@ -1,16 +1,17 @@
 <% curacc = current_user.current_account %>
+<% vanity_name = curacc.try(:vanity_name) || curacc.try(:padma).try(:vanity_name) || curacc.name %>
 <% if curacc && !curacc.name.blank? -%>
   <li>
     <%= link_to t("header-menu.stats.pdg_report"),
-              "#{APP_CONFIG['crm-url']}/statistics/accounts/#{curacc.padma.vanity_name}/reports/pedagogic/#{Date.today.year}/#{Date.today.month}" %>
+              "#{APP_CONFIG['crm-url']}/statistics/accounts/#{vanity_name}/reports/pedagogic/#{Date.today.year}/#{Date.today.month}" %>
   </li>
   <li>
     <%= link_to t("header-menu.stats.overmind"),
-              "#{APP_CONFIG['crm-url']}/statistics/accounts/#{curacc.padma.vanity_name}" %>
+              "#{APP_CONFIG['crm-url']}/statistics/accounts/#{vanity_name}" %>
   </li>
   <li>
     <%= link_to t("header-menu.stats.teacher_ranking"),
-              "#{APP_CONFIG['crm-url']}/statistics/accounts/#{curacc.padma.vanity_name}/user_rankings" %>
+              "#{APP_CONFIG['crm-url']}/statistics/accounts/#{vanity_name}/user_rankings" %>
   </li>
 <% end -%>
 <li>

metadata

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