##########################################################################
# Copyright 2016 ThoughtWorks, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
##########################################################################

module Admin
  class NewDashboardController < ::ApplicationController
    include AuthenticationHelper

    layout 'single_page_app'
    before_action :check_user_and_404

    def index
      @view_title = 'Dashboard'
      @is_quick_edit_page_enabled = Toggles.isToggleOn(Toggles.PIPELINE_CONFIG_SINGLE_PAGE_APP) and Toggles.isToggleOn(Toggles.QUICK_EDIT_PAGE_DEFAULT)
    end
  end
end

##########################################################################
# Copyright 2016 ThoughtWorks, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
##########################################################################

module Admin
  class NewDashboardController < ::ApplicationController
    include AuthenticationHelper

    layout 'single_page_app'
    before_action :check_user_and_404

    def index
      @view_title = 'Dashboard'
      @is_quick_edit_page_enabled = Toggles.isToggleOn(Toggles.PIPELINE_CONFIG_SINGLE_PAGE_APP) && Toggles.isToggleOn(Toggles.QUICK_EDIT_PAGE_DEFAULT)
    end
  end
end

Fix is_quick_edit_page_enabled to check for both pipeline_config_single_page_app_key and quick_edit_page_toggle_key toggles * Change the conditional check from 'and' to '&&'
Fix is_quick_edit_page_enabled to check for both pipeline_config_single_page_app_key and quick_edit_page_toggle_key toggles
* Change the conditional check from 'and' to '&&'
