Context Navigation

Changeset 2671549

Timestamp:

02/02/2022 05:58:52 PM (4 years ago)

Author:

maurolopes

Message:

Preparing for 1.0.1 release

Location:

unenroll-for-learndash/trunk

Files:

r2586221	r2671549
62	62	'default' => 'none',
63	63	'description'=> __('Select where to place the \'Unenroll\' button on the grid', 'learndash-unenroll'),
64		'obs' => '',
	64	'obs' => __('Be aware that the \'Unenroll\' button will be placed on the grid only when the grid shortcode [ld_course_list] is used. If you plan to use the new Course Grid Block feature, the \'Unenroll\' button will not be displayed on the grid, leaving you with the option to show the button on the single course page.', 'learndash-unenroll'),
65	65	'final' => '',
66	66	'order' => 4,

-                      r2586221
+                      r2671549
 const errorAlertTitle = trun_js_object.errorAlertTitle;
 const errorAlertText = trun_js_object.errorAlertText;
+const errorAlertAdminText = trun_js_object.errorAlertAdminText;
 const alertReloadButton = trun_js_object.alertReloadButton;
 const cancelAlertTextGroup = trun_js_object.cancelAlertTextGroup;
 …
                                 responseText = errorAlertText;
                                 responseType = 'warning';
+                                //check if response has 'admin' substring in it
+                                if(response.indexOf('admin') > -1) {
+                                    responseText = errorAlertAdminText;
+                                }
+                            }
                             console.log(response);

-                      r2586221
+                      r2671549
+    }
+    $user_id = get_current_user_id();
+    //get current user
+    $user = wp_get_current_user();
+    $user_id = $user->ID;
+     //check if has admin role
+    $admin_roles = array(
+        'administrator'
+    );
+    $has_admin_role = array_intersect($admin_roles, $user->roles );
+    if($has_admin_role) {
+        wp_die('Error: admin');
+    }
     $user_groups = ( !empty($_POST['userGroups']) && is_array($_POST['userGroups']) ) ? (array)$_POST['userGroups'] : [];
 …
+    }
     //User still has access. Course must be part of a group
+    //User still has access. Course must be admin or part of a group
     if(empty($user_groups)) {
         //very strange...that should not happen

-                      r2586221
+                      r2671549
  * Author: Luis Rock
  * Author URI: https://wptrat.com/
  * Version: 1.0.0
+ * Version: 1.0.1
  * Text Domain: learndash-unenroll
  * Domain Path: /languages
 …
             /* translators: Text for the (maybe) error alert box */
             'errorAlertText' => esc_html__( 'We could not check the result.', 'learndash-unenroll' ),
+            /* translators: Text for when an admin is trying to enroll from a course (which is impossible) */
+            'errorAlertAdminText' => esc_html__( 'You are a site admin, so you cannot unenroll.', 'learndash-unenroll' ),
             /* translators: Text for the alert box reload button */
             'alertReloadButton' => esc_html__( 'Reload', 'learndash-unenroll' ),

-                      r2586221
+                      r2671549
 Tested up to: 5.8
 Requires PHP: 5.6
 Stable tag: 1.0.0
+Stable tag: 1.0.1
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 …
 == Changelog ==
+= 1.0.1 =
+* Added: alert that site admin user cannot unenroll
+* Added: inform on the settings page that the 'Unenroll' button will be placed on the grid only when the grid shortcode [ld_course_list] is used (no support for the new Course Grid Block feature).
 = 1.0.0 =
 * Initial Release.

Note: See TracChangeset for help on using the changeset viewer.