Преглед изворни кода

Merge pull request #710 from FreshRSS/hide-article

Add an automatic sticky post configuration
Alexis Degrugillier пре 11 година
родитељ
комит
0ad04f82ea
2 измењених фајлова са 19 додато и 1 уклоњено
  1. 18 0
      app/Models/Context.php
  2. 1 1
      app/views/helpers/javascript_vars.phtml

+ 18 - 0
app/Models/Context.php

@@ -287,4 +287,22 @@ class FreshRSS_Context {
 		}
 		}
 		return true;
 		return true;
 	}
 	}
+
+	/**
+	 * Determine if the "sticky post" option is enabled. It can be enable
+	 * by the user when it is selected in the configuration page or by the
+	 * application when the context allows to auto-remove articles when they
+	 * are read.
+	 *
+	 * @return boolean
+	 */
+	public static function isStickyPostEnabled() {
+		if (self::$conf->sticky_post) {
+			return true;
+		}
+		if (self::isAutoRemoveAvailable()) {
+			return true;
+		}
+		return false;
+	}
 }
 }

+ 1 - 1
app/views/helpers/javascript_vars.phtml

@@ -27,7 +27,7 @@ echo 'var context={',
 	'auto_load_more:', FreshRSS_Context::$conf->auto_load_more ? 'true' : 'false', ',',
 	'auto_load_more:', FreshRSS_Context::$conf->auto_load_more ? 'true' : 'false', ',',
 	'auto_actualize_feeds:', $auto_actualize ? 'true' : 'false', ',',
 	'auto_actualize_feeds:', $auto_actualize ? 'true' : 'false', ',',
 	'does_lazyload:', FreshRSS_Context::$conf->lazyload ? 'true' : 'false', ',',
 	'does_lazyload:', FreshRSS_Context::$conf->lazyload ? 'true' : 'false', ',',
-	'sticky_post:', FreshRSS_Context::$conf->sticky_post ? 'true' : 'false', ',',
+	'sticky_post:', FreshRSS_Context::isStickyPostEnabled() ? 'true' : 'false', ',',
 	'html5_notif_timeout:', FreshRSS_Context::$conf->html5_notif_timeout, ',',
 	'html5_notif_timeout:', FreshRSS_Context::$conf->html5_notif_timeout, ',',
 	'auth_type:"', Minz_Configuration::authType(), '",',
 	'auth_type:"', Minz_Configuration::authType(), '",',
 	'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',',
 	'current_user_mail:', $mail ? ('"' . $mail . '"') : 'null', ',',