pageflow 12.0.4 → 12.1.0

data/admins/pageflow/accounts.rb

@@ -1,7 +1,6 @@
 module Pageflow
   ActiveAdmin.register Account, :as => 'Account' do
-    menu priority: 3,
-         if: proc { authorized?(:index, :accounts) }
+    menu({priority: 3}.merge(Pageflow.config.account_admin_menu_options))
 
     config.batch_actions = false
 
@@ -36,8 +35,29 @@ module Pageflow
       end
     end
 
+    csv do
+      column :name
+      column :entries_count
+      column :users_count
+    end
+
     filter :name
 
+    searchable_select_options(text_attribute: :name,
+                              scope: lambda do
+                                Account
+                                  .accessible_by(current_ability, :read)
+                                  .order(:name)
+                              end)
+
+    searchable_select_options(name: :member_addable,
+                              text_attribute: :name,
+                              scope: lambda do
+                                AccountPolicy::Scope.new(current_user, Account)
+                                  .member_addable
+                                  .order(:name)
+                              end)
+
     form :partial => 'form'
 
     show :title => :name do |account|
@@ -90,8 +110,7 @@ module Pageflow
         result = params.permit(account: permitted_account_attributes)
 
         if result[:account]
-          feature_states = params[:account][:feature_states].try(:permit!)
-          result[:account].merge!(feature_states: feature_states || {})
+          permit_feature_states(result[:account])
         end
 
         result
@@ -137,6 +156,13 @@ module Pageflow
           []
         end
       end
+
+      def permit_feature_states(attributes)
+        if params[:id] && authorized?(:update_feature_configuration_on, resource)
+          feature_states = params[:account][:feature_states].try(:permit!)
+          attributes.merge!(feature_states: feature_states || {})
+        end
+      end
     end
   end
 end

data/admins/pageflow/entry.rb

@@ -48,10 +48,19 @@ module Pageflow
       end
     end
 
+    csv do
+      column :slug
+      column :title
+      column :created_at
+      column :edited_at
+      column :published_at
+    end
+
     filter :title
     filter :account,
-           if: ->(_) { authorized?(:index, :accounts) },
-           collection: -> { Account.accessible_by(current_ability, :read) }
+           as: :searchable_select,
+           ajax: true,
+           if: ->(_) { authorized?(:index, :accounts) }
     filter :created_at
     filter :edited_at
     filter :first_published_at
@@ -61,27 +70,62 @@ module Pageflow
            collection: -> { collection_for_entry_publication_states }
 
     sidebar :folders, only: :index do
-      text_node(link_to(I18n.t('pageflow.admin.entries.add_folder'),
-                        new_admin_folder_path,
-                        class: 'new'))
+      if AccountPolicy::Scope.new(current_user, Account).folder_addable.any?
+        text_node(link_to(I18n.t('pageflow.admin.entries.add_folder'),
+                          new_admin_folder_path,
+                          class: 'new'))
+      end
       grouped_folder_list(Folder.accessible_by(current_ability, :read).includes(:account),
                           active_id: params[:folder_id],
                           grouped_by_accounts: authorized?(:see, :accounts))
     end
 
+    searchable_select_options(name: :eligible_accounts,
+                              text_attribute: :name,
+                              scope: lambda do
+                                AccountPolicy::Scope
+                                  .new(current_user, Account)
+                                  .entry_movable
+                                  .order(:name)
+                              end)
+
+    searchable_select_options(name: :eligible_themings,
+                              text_attribute: :name,
+                              scope: lambda do |params|
+                                entry = Entry.find(params[:entry_id])
+
+                                ThemingPolicy::Scope
+                                  .new(current_user, Theming)
+                                  .themings_allowed_for(entry.account)
+                              end)
+
     form do |f|
       f.inputs do
         f.input :title, hint: I18n.t('pageflow.admin.entries.title_hint')
 
         if authorized?(:update_account_on, resource)
-          f.input :account,
-                  collection: eligible_accounts,
+          f.input(:account,
+                  as: :searchable_select,
                   include_blank: false,
-                  input_html: {class: 'entry_account_input'}
+                  ajax: {
+                    resource: Entry,
+                    collection_name: :eligible_accounts
+                  },
+                  input_html: {class: 'entry_account_input', style: 'width: 200px'})
         end
 
         if authorized?(:update_theming_on, resource) && !f.object.new_record?
-          f.input :theming, collection: eligible_themings, include_blank: false
+          f.input(:theming,
+                  as: :searchable_select,
+                  ajax: {
+                    resource: Entry,
+                    collection_name: :eligible_themings,
+                    params: {
+                      entry_id: resource.id
+                    }
+                  },
+                  include_blank: false,
+                  input_html: {style: 'width: 200px'})
         end
 
         if authorized?(:configure_folder_for, resource)
@@ -167,6 +211,12 @@ module Pageflow
         entry.theming ||= entry.account.default_theming
       end
 
+      before_update do |entry|
+        if entry.account_id_changed? && !authorized?(:update_theming_on, resource)
+          entry.theming = entry.account.default_theming
+        end
+      end
+
       def update
         update! do |success, _|
           success.html { redirect_to(admin_entry_path(resource, params.slice(:tab))) }

data/admins/pageflow/membership.rb

@@ -6,6 +6,63 @@ module Pageflow
 
     form partial: 'form'
 
+    searchable_select_options(name: :potential_accounts_for_user,
+                              text_attribute: :name,
+                              scope: lambda do |params|
+                                user = User.find(params[:parent_id])
+
+                                PotentialMemberships
+                                  .creatable_by(current_user)
+                                  .accounts_for_user(user)
+                                  .order(:name)
+                              end)
+
+    searchable_select_options(name: :potential_entries_for_user,
+                              display_text: lambda do |entry|
+                                [entry.try(:account_name), entry.title].compact.join(' / ')
+                              end,
+                              scope: lambda do |params|
+                                user = User.find(params[:parent_id])
+                                entries = PotentialMemberships
+                                  .creatable_by(current_user)
+                                  .entries_for_user(user)
+
+                                if can?(:see, :accounts)
+                                  entries.include_account_name.order('account_name', :title)
+                                else
+                                  entries.order(:title)
+                                end
+                              end,
+                              filter: lambda do |term, scope|
+                                EntryTitleOrAccountNameQuery::Scope.new(term, scope).resolve
+                              end)
+
+    searchable_select_options(name: :potential_users_for_account,
+                              text_attribute: :formal_name,
+                              scope: lambda do |params|
+                                account = Account.find(params[:parent_id])
+                                PotentialMemberships
+                                  .creatable_by(current_user)
+                                  .users_for_account(account)
+                                  .order(:last_name, :first_name)
+                              end,
+                              filter: lambda do |term, scope|
+                                UserNameQuery::Scope.new(term, scope).resolve
+                              end)
+
+    searchable_select_options(name: :potential_users_for_entry,
+                              text_attribute: :formal_name,
+                              scope: lambda do |params|
+                                entry = Entry.find(params[:parent_id])
+                                PotentialMemberships
+                                  .creatable_by(current_user)
+                                  .users_for_entry(entry)
+                                  .order(:last_name, :first_name)
+                              end,
+                              filter: lambda do |term, scope|
+                                UserNameQuery::Scope.new(term, scope).resolve
+                              end)
+
     controller do
       belongs_to :entry, parent_class: Pageflow::Entry, polymorphic: true
       belongs_to :account, parent_class: Pageflow::Account, polymorphic: true
@@ -14,12 +71,6 @@ module Pageflow
       helper Pageflow::Admin::MembershipsHelper
       helper Pageflow::Admin::FormHelper
 
-      def permitted_params
-        result = params.permit(membership: [:user_id, :entity_id, :entity_type, :role])
-        restrict_attributes(result[:membership]) if result[:membership]
-        result
-      end
-
       def index
         if params[:user_id].present?
           redirect_to admin_user_url(params[:user_id])

data/admins/pageflow/user.rb

@@ -1,6 +1,6 @@
 module Pageflow
   ActiveAdmin.register User do
-    menu priority: 2, if: proc { authorized?(:index, current_user) }
+    menu priority: 2
 
     actions :all, except: [:new, :create]
 
@@ -20,6 +20,16 @@ module Pageflow
       boolean_status_tag_column :suspended?
     end
 
+    csv do
+      column :id
+      column :first_name
+      column :last_name
+      column :email
+      column :last_sign_in_at
+      column :sign_in_count
+      column :suspended?
+    end
+
     filter :last_name
     filter :first_name
     filter :email
@@ -43,7 +53,9 @@ module Pageflow
           row :locale do
             I18n.t('language', locale: user.locale)
           end
-          boolean_status_tag_row(:admin?, 'admin warning')
+          if authorized?(:see_admin_status, user)
+            boolean_status_tag_row(:admin?, 'admin warning')
+          end
         end
 
         para do
@@ -108,10 +120,19 @@ module Pageflow
       end
     end
 
+    collection_action :quota_state do
+      @account = Pageflow::Account.find(params[:account_id])
+      authorize!(:add_member_to, @account)
+
+      render(layout: false)
+    end
+
     collection_action 'me', title: I18n.t('pageflow.admin.users.account'), method: [:get, :patch] do
+      @user = User.find(current_user.id)
+
       if request.patch?
-        if current_user.update_with_password(user_profile_params)
-          sign_in current_user, bypass: true
+        if @user.update_with_password(user_profile_params)
+          sign_in @user, bypass: true
           redirect_to admin_root_path, notice: I18n.t('pageflow.admin.users.me.updated')
         end
       end

data/app/assets/javascripts/pageflow/admin/entries.js

@@ -70,9 +70,11 @@ jQuery(function($) {
         }
       });
 
-      $('#folders_sidebar_section')
-        .append('<a href="#" class="edit_toggle edit" title="Bearbeiten"></a>')
-        .append('<a href="#" class="edit_toggle done" title="Fertig"></a>');
+      if ($('#folders_sidebar_section a.new').length > 0) {
+        $('#folders_sidebar_section')
+          .append('<a href="#" class="edit_toggle edit" title="Bearbeiten"></a>')
+          .append('<a href="#" class="edit_toggle done" title="Fertig"></a>');
+      }
 
       $('#folders_sidebar_section .edit_toggle').on('click', function() {
         $('#folders_sidebar_section').toggleClass('editable');

data/app/assets/javascripts/pageflow/admin/users.js

@@ -0,0 +1,33 @@
+jQuery(function($) {
+  $('.admin_users form.pageflow_invitation_form').each(function() {
+    var quotaStateContainer = $('#quota_state_container', this);
+    var accountSelect = $('#invitation_form_membership_entity_id', this);
+    var fieldsets = $('#invitation_form_details', this).add('fieldset.actions', this);
+
+    function updateQutaState() {
+      var selectedAccountId = accountSelect.val();
+
+      $.get('/admin/users/quota_state?account_id=' + selectedAccountId)
+        .success(function(html) {
+          quotaStateContainer.html(html);
+          updateForm();
+        });
+    }
+
+    function updateForm() {
+      if (quotaAvailable()) {
+        fieldsets.show();
+      }
+      else {
+        fieldsets.hide();
+      }
+    }
+
+    function quotaAvailable() {
+      return !!quotaStateContainer.find('[data-state=available]').length;
+    }
+
+    accountSelect.on('change', updateQutaState);
+    updateForm();
+  });
+});

data/app/assets/javascripts/pageflow/admin.js

@@ -1,4 +1,7 @@
 //= require jquery-ui/droppable
+//= require active_admin/searchable_select
+//= require select2_locale_de
 
 //= require ./admin/accounts
-//= require ./admin/entries
+//= require ./admin/entries
+//= require ./admin/users

data/app/assets/javascripts/pageflow/audio_context.js

@@ -0,0 +1,28 @@
+/**
+ * Obtain the globally shared audio context. There can only be a
+ * limited number of `AudioContext` objects in one page.
+ *
+ * @since 12.1
+ */
+pageflow.audioContext = {
+  /**
+   * @returns [AudioContext]
+   *   Returns `null` if web audio API is not supported or creating
+   *   the context fails.
+   */
+  get: function() {
+    var AudioContext = window.AudioContext || window.webkitAudioContext;
+
+    if (typeof this._audioContext === 'undefined') {
+      try {
+        this._audioContext = AudioContext && new AudioContext();
+      }
+      catch(e) {
+        this._audioContext = null;
+        pageflow.log('Failed to create AudioContext.', {force: true});
+      }
+    }
+
+    return this._audioContext;
+  }
+};

data/app/assets/javascripts/pageflow/audio_player/get_media_element_method.js

@@ -0,0 +1,5 @@
+pageflow.AudioPlayer.getMediaElementMethod = function(player) {
+  player.getMediaElement = function() {
+    return player.audio.audio;
+  };
+};

data/app/assets/javascripts/pageflow/audio_player.js

@@ -7,6 +7,7 @@
 //= require ./audio_player/seek_with_invalid_state_handling
 //= require ./audio_player/rewind_method
 //= require ./audio_player/pause_in_background
+//= require ./audio_player/get_media_element_method
 
 /**
  * Playing audio sources
@@ -63,6 +64,7 @@ pageflow.AudioPlayer = function(sources, options) {
 
   pageflow.AudioPlayer.seekWithInvalidStateHandling(audio);
   pageflow.AudioPlayer.rewindMethod(audio);
+  pageflow.AudioPlayer.getMediaElementMethod(audio);
 
   audio.src = function(sources) {
     ready.then(function() {

data/app/assets/javascripts/pageflow/base.js

@@ -1,31 +1,12 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
+// base JavaScript file for Pageflow.
+// This file is meant to hold code we develop.
+// And vendor code that changes a lot.
 
 //= require polyfills/bind
 
-//= require i18n
-//= require jquery
-//= require jquery-ui/widget
-//= require jquery_ujs
 //= require ./jquery_utils
-//= require iscroll
-//= require audio5.min
 //= require ./videojs
-//= require jquery.fullscreen
-//= require jquery.placeholder
 
-//= require react
-//= require backbone-rails
 //= require_self
 
 //= require ./object
@@ -42,6 +23,7 @@
 //= require ./features
 //= require ./audio
 //= require ./audio_player
+//= require ./audio_context
 //= require ./video_player
 //= require ./visited
 //= require ./print_layout