Merge branch 'features-addition_date_desc_view_list_order'

justingit · Sep 20, 2021 · 1fbca8e · 1fbca8e
2 parents 5fba77d + 921d4b4
commit 1fbca8e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/dada/DADA/App.pm b/dada/DADA/App.pm
@@ -8600,7 +8600,7 @@ sub subscription_options {
                 -associate => $q,
                 -settings  => {
                     view_list_subscriber_number                      => undef,
-                    view_list_show_timestamp_col                     => 0,
+                    #view_list_show_timestamp_col                     => 0,
                     view_list_order_by                               => undef,
                     view_list_order_by_direction                     => undef,
                     view_list_show_sub_confirm_list                  => 0,

diff --git a/dada/DADA/Config.pm b/dada/DADA/Config.pm
@@ -1455,8 +1455,8 @@ $MIME_TOOLS_PARAMS //= {
     view_list_show_timestamp_col           => 1, 
 	view_list_show_sub_confirm_list        => 1, 
 	view_list_enable_delete_all_button     => 0,
-    view_list_order_by                     => 'email', 
-    view_list_order_by_direction           => 'ASC', 
+    view_list_order_by                     => 'timestamp', 
+    view_list_order_by_direction           => 'DESC', 
 
     # add list prefs
     use_add_list_import_limit              => 1, 

diff --git a/dada/templates/subscription_options_screen.tmpl b/dada/templates/subscription_options_screen.tmpl
@@ -55,15 +55,19 @@
     </div> 
     <!-- tmpl_if can_have_subscriber_fields --> 
 
-        <div class="row">
-            <div class="small-12 columns">
-                <input type="checkbox" name="view_list_show_timestamp_col" id="view_list_show_timestamp_col" value="1" <!-- tmpl_if list_settings.view_list_show_timestamp_col -->checked="checked"<!--/tmpl_if--> >
-                <label for="view_list_show_timestamp_col">
-                 Show, &quot;Subscription Date&quot; column
-                </label>
-            </div> 
-        </div>
+
 
+		<!-- tmpl_if comment --> 
+			<!-- this is a feature that's basically removed - we always show the subscription date: -->
+		    <div class="row">
+	            <div class="small-12 columns">
+	                <input type="checkbox" name="view_list_show_timestamp_col" id="view_list_show_timestamp_col" value="1" <!-- tmpl_if list_settings.view_list_show_timestamp_col -->checked="checked"<!--/tmpl_if--> >
+	                <label for="view_list_show_timestamp_col">
+	                 Show, &quot;Subscription Date&quot; column
+	                </label>
+	            </div> 
+	        </div>
+		<!-- /tmpl_if -->
 
         <div class="row">
             <div class="small-12 columns">