Merge branch 'develop' into 2.0

GravityKit · Sep 2, 2017 · d9fe0f8 · d9fe0f8
2 parents ee376e9 + 02c687c
commit d9fe0f8
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 8 deletions.
diff --git a/includes/class-gravityview-settings.php b/includes/class-gravityview-settings.php
@@ -632,7 +632,14 @@ public function get_app_setting( $setting_name ) {
 	 * @return array
 	 */
 	public function get_app_settings() {
-		return get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', $this->get_default_settings() );
+
+	    $settings = get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', $this->get_default_settings() );
+
+		if( defined( 'GRAVITYVIEW_LICENSE_KEY' ) ) {
+			$settings['license_key'] = GRAVITYVIEW_LICENSE_KEY;
+		}
+
+		return $settings;
 	}
 
 
@@ -667,7 +674,11 @@ public function set_field_error( $field, $error_message = '' ) {
 	 */
 	protected function settings_edd_license( $field, $echo = true ) {
 
-		$text = self::settings_text( $field, false );
+	    if( defined('GRAVITYVIEW_LICENSE_KEY') && ! empty( GRAVITYVIEW_LICENSE_KEY ) ) {
+		    $field['input_type'] = 'password';
+        }
+
+		$text = $this->settings_text( $field, false );
 
 		$activation = $this->License_Handler->settings_edd_license_activation( $field, false );
 
@@ -895,6 +906,7 @@ public function app_settings_fields() {
 				'label'             => __( 'License Key', 'gravityview' ),
 				'description'          => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ) . $this->get_license_handler()->license_details( $this->get_app_setting( 'license_key_response' ) ),
 				'type'              => 'edd_license',
+				'disabled'          => ( defined('GRAVITYVIEW_LICENSE_KEY')  && ! empty( GRAVITYVIEW_LICENSE_KEY ) ),
 				'data-pending-text' => __('Verifying license&hellip;', 'gravityview'),
 				'default_value'           => $default_settings['license_key'],
 				'class'             => ( '' == $this->get_app_setting( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
@@ -990,8 +1002,11 @@ public function app_settings_fields() {
 			if( $disabled_attribute ) {
 				$field['disabled']  = $disabled_attribute;
 			}
-		}
 
+			if( empty( $field['disabled'] ) ) {
+				unset( $field['disabled'] );
+            }
+		}
 
         $sections = array(
             array(

diff --git a/readme.txt b/readme.txt
@@ -24,6 +24,16 @@ Beautifully display your Gravity Forms entries. Learn more on [gravityview.co](h
 
 The changelog will not be maintained for beta versions. __For information about the Beta, please [read up here](https://github.com/gravityview/GravityView/wiki/The-Future-of-GravityView)__.
 
+= 1.22 =
+
+* Fixed: Inline Edit plugin not working when displaying a single entry
+* Fixed: Featured Entries plugin not adding correct CSS selector to the single entry container
+
+__Developer Updates:__
+
+* Fixed: When `GRAVITYVIEW_LICENSE_KEY` constant is defined, it will always be used, and the license field will be disabled
+* Fixed: List View and Table View templates have more standardized CSS selectors for single & multiple contexts ([Learn more](http://docs.gravityview.co/article/63-css-guide))
+
 = 1.21.5.3 on July 24, 2017 =
 
 * Fixed: For some field types, the value "No" would be interpreted as `false`
@@ -1495,4 +1505,4 @@ We're just getting started with what can be done with DataTables. We'll have muc
 
 = 1.0 =
 
-* Liftoff!
+* Liftoff!
diff --git a/templates/deprecated/list-header.php b/templates/deprecated/list-header.php
@@ -9,5 +9,5 @@
  */
 ?>
 <?php gravityview_before(); ?>
-<div class="<?php gv_container_class('gv-list-container'); ?>">
+<div class="<?php gv_container_class('gv-list-container gv-list-view gv-list-multiple-container'); ?>">
 	<?php gravityview_header(); ?>
diff --git a/templates/deprecated/list-single.php b/templates/deprecated/list-single.php
@@ -10,7 +10,7 @@
 ?>
 <?php gravityview_before(); ?>
 
-<div class="gv-container gv-list-single-container gv-list-container">
+<div class="<?php gv_container_class( 'gv-list-view gv-list-container gv-list-single-container' ); ?>">
 	<p class="gv-back-link"><?php echo gravityview_back_link(); ?></p>
 	<?php
     if( $this->getContextFields() ) {

diff --git a/templates/deprecated/table-header.php b/templates/deprecated/table-header.php
@@ -9,7 +9,7 @@
  */
 ?>
 <?php gravityview_before(); ?>
-<div class="<?php gv_container_class('gv-table-container'); ?>">
+<div class="<?php gv_container_class('gv-table-view gv-table-container gv-table-multiple-container'); ?>">
 <table class="gv-table-view">
 	<thead>
 		<?php gravityview_header(); ?>

diff --git a/templates/deprecated/table-single.php b/templates/deprecated/table-single.php
@@ -12,7 +12,7 @@
 
 <p class="gv-back-link"><?php echo gravityview_back_link(); ?></p>
 
-<div class="gv-table-view gv-container gv-table-single-container">
+<div class="<?php gv_container_class( 'gv-table-view gv-table-container gv-table-single-container' ); ?>">
 	<table class="gv-table-view-content">
 		<?php if( $this->getFields('single_table-columns') ) { ?>
 			<thead>