Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu

2015-01-08 23:06:25 +08:00 · 2015-01-08 23:06:25 +08:00 · e1a80e496a
parent ceb110e030 da06328013
commit e1a80e496a
1 changed files with 3 additions and 1 deletions
--- a/app/views/admin/authorizations/index.html.erb
+++ b/app/views/admin/authorizations/index.html.erb
@ -96,7 +96,9 @@

 <script type="text/javascript">
  var lis = $("ul#card-list-submanagers li");
+  <% if !@objects.nil? %>
    var app_categories = <%= @objects.collect{|c| {"id" => c.id.to_s, "disable" => c.disable}}.to_json.html_safe %>;
+  <% end %>
 </script>