Changeset 2389813
- Timestamp:
- 09/28/2020 04:05:53 PM (6 years ago)
- Location:
- digirisk/trunk
- Files:
-
- 12 edited
-
digirisk.config.json (modified) (1 diff)
-
digirisk.php (modified) (1 diff)
-
modules/evaluation_method/asset/js/evaluation_method_dropdown.backend.js (modified) (1 diff)
-
modules/navigation/view/item.view.php (modified) (1 diff)
-
modules/risk/asset/js/risk-page.backend.js (modified) (3 diffs)
-
modules/risk/view/page/item-edit.view.php (modified) (2 diffs)
-
modules/setting/action/class-setting-action.php (modified) (5 diffs)
-
modules/setting/asset/js/setting.backend.js (modified) (1 diff)
-
modules/setting/class/class-setting-class.php (modified) (1 diff)
-
modules/setting/view/general/main.view.php (modified) (1 diff)
-
modules/setting/view/main.view.php (modified) (1 diff)
-
readme.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
digirisk/trunk/digirisk.config.json
r2386921 r2389813 2 2 "name": "Digirisk", 3 3 "slug": "digirisk", 4 "version": "7.6. 1",4 "version": "7.6.2", 5 5 "description": "L'application Digirisk", 6 6 "insert_scripts_pages_js": [ -
digirisk/trunk/digirisk.php
r2386921 r2389813 4 4 * Plugin URI: http://www.evarisk.com/document-unique-logiciel 5 5 * Description: Avec le plugin Digirisk vous pourrez réaliser, de façon simple et intuitive, le ou les documents uniques de vos entreprises et gérer toutes les données liées à la sécurité de votre personnel. 6 * Version: 7.6. 16 * Version: 7.6.2 7 7 * Author: Evarisk 8 8 * Author URI: http://www.evarisk.com -
digirisk/trunk/modules/evaluation_method/asset/js/evaluation_method_dropdown.backend.js
r2371149 r2389813 12 12 13 13 window.eoxiaJS.digirisk.evaluationMethodDropdown.event = function() { 14 jQuery( document ).on( 'click', '.table.risk .dropdown-list li.dropdown-item:not(.open-popup), .wpeo-table.table- risk .dropdown-list li.dropdown-item:not(.open-popup)', window.eoxiaJS.digirisk.evaluationMethodDropdown.selectSeuil );14 jQuery( document ).on( 'click', '.table.risk .dropdown-list li.dropdown-item:not(.open-popup), .wpeo-table.table-listing-risk .dropdown-list li.dropdown-item:not(.open-popup), .wpeo-table.table-risk .dropdown-list li.dropdown-item:not(.open-popup)', window.eoxiaJS.digirisk.evaluationMethodDropdown.selectSeuil ); 15 15 }; 16 16 -
digirisk/trunk/modules/navigation/view/item.view.php
r2260627 r2389813 49 49 data-before-method="setUnitActive"> 50 50 <span class="title-container"> 51 <span class="ref"><?php echo esc_html( $society->unique_identifier ); ?></span> 51 <?php if ( Setting_Class::g()->hide_GP_UT_number() == false ) : ?> 52 <span class="ref"><?php echo esc_html( $society->unique_identifier ); ?></span> 53 <?php endif; ?> 52 54 <span class="name"><?php echo esc_html( $society->post_title ); ?></span> 53 55 </span> -
digirisk/trunk/modules/risk/asset/js/risk-page.backend.js
r2371149 r2389813 17 17 window.eoxiaJS.digirisk.risk_page.event = function() { 18 18 jQuery( document ).on( 'click', '.risk-page .save-all:not(.grey)', window.eoxiaJS.digirisk.risk_page.saveRisks ); 19 jQuery( document ).on( 'click', '.risk-page table tr input:not(input[type="checkbox"]), .risk-page tr .wpeo-dropdown .dropdown-toggle, .risk-page tr textarea, .risk-page tr .popup, .risk-page tr .action, .risk-page .cotation', window.eoxiaJS.digirisk.risk_page.checkTheCheckbox ); 20 19 jQuery( document ).on( 'click', '.risk-page table tr input:not(input[type="checkbox"]), .risk-page .table-row .group-date, .risk-page .table-row .wpeo-dropdown .dropdown-toggle, .risk-page .table-row textarea, .risk-page .table-row .popup, .risk-page .table-row .action, .risk-page .cotation', window.eoxiaJS.digirisk.risk_page.checkTheCheckbox ); 21 20 jQuery( document ).on( 'click', '.risk-page .wp-digi-pagination a', window.eoxiaJS.digirisk.risk_page.pagination ); 22 21 }; … … 27 26 } 28 27 29 jQuery( '.risk-page tr.edit-risk.checked:first' ).click();28 jQuery( '.risk-page .table-row .edit-risk.checked:first' ).click(); 30 29 jQuery( '.risk-page .save-all' ).addClass( 'button-disable' ); 31 30 }; … … 45 44 }; 46 45 47 window.eoxiaJS.digirisk.risk_page.savedRiskSuccess = function( element, response ) {48 jQuery( element ).closest( 'tr' ).replaceWith( response.data.template );49 window.eoxiaJS.digirisk.risk_page.saveRisks( undefined);46 window.eoxiaJS.digirisk.risk_page.savedRiskSuccess = function( Trigelement, response ) { 47 Trigelement.closest( '.table-row' ).replaceWith( response.data.template ); 48 window.eoxiaJS.digirisk.risk_page.saveRisks(); 50 49 }; 51 50 -
digirisk/trunk/modules/risk/view/page/item-edit.view.php
r2371149 r2389813 16 16 } ?> 17 17 18 <div class="table-row ">18 <div class="table-row listing-risk risk-row edit" data-id="<?php echo esc_attr( $risk->data['id'] ); ?>"> 19 19 <input type="hidden" name="action" value="edit_risk" /> 20 20 <input type="hidden" name="page" value="all_risk" /> 21 21 <input type="hidden" name="parent_id" value="<?php echo esc_attr( $risk->data['parent_id'] ); ?>" /> 22 <input type="hidden" name="can_update" value="true"/> 23 <input name="id" type="hidden" value="<?php echo esc_attr( $risk->data['id'] ); ?>" /> 22 24 <input name="risk[id]" type="hidden" value="<?php echo esc_attr( $risk->data['id'] ); ?>" /> 23 25 <?php wp_nonce_field( 'edit_risk' ); ?> … … 39 41 <input type="checkbox" name="can_update" /> 40 42 <a href="#" data-id="<?php echo esc_attr( $risk->data['id'] ); ?>" 41 data-parent=" risk-row"42 data-loader="table "43 data-parent="listing-risk" 44 data-loader="table-listing-risk" 43 45 class="edit-risk action-input fas fa-save" aria-hidden="true" style="display: none;" ></a> 44 46 </div> -
digirisk/trunk/modules/setting/action/class-setting-action.php
r2260627 r2389813 117 117 $can_edit_risk_category = (bool) get_option( 'edit_risk_category', false ); 118 118 $can_edit_type_cotation = (bool) get_option( 'edit_type_cotation', false ); 119 $can_mask_number_GP_UT = (bool) get_option( 'mask_number_GP_UT', false ); 119 120 $require_unique_security_id = (bool) get_option( 'require_unique_security_id', false ); 120 121 $unique_security_id = get_option( \eoxia\Config_Util::$init['digirisk']->child->security_id_key, false ); … … 138 139 'can_edit_risk_category' => $can_edit_risk_category, 139 140 'can_edit_type_cotation' => $can_edit_type_cotation, 141 'can_mask_number_GP_UT' => $can_mask_number_GP_UT, 140 142 'require_unique_security_id' => $require_unique_security_id, 141 143 'unique_security_id' => $unique_security_id, … … 248 250 check_ajax_referer( 'save_general_settings_digirisk' ); 249 251 250 $domain_mail = ! empty( $_POST['domain_mail'] ) ? sanitize_text_field( $_POST['domain_mail'] ) : ''; 251 $can_edit_risk_category = ( isset( $_POST['edit_risk_category'] ) && 'true' == $_POST['edit_risk_category'] ) ? true : false; 252 $can_edit_type_cotation = ( isset( $_POST['edit_type_cotation'] ) && 'true' == $_POST['edit_type_cotation'] ) ? true : false; 253 $general_data_options = ! empty( $_POST['general_options'] ) ? (array) $_POST['general_options'] : array(); 252 $domain_mail = ! empty( $_POST['domain_mail'] ) ? sanitize_text_field( $_POST['domain_mail'] ) : ''; 253 $can_edit_risk_category = ( isset( $_POST['edit_risk_category'] ) && 'true' == $_POST['edit_risk_category'] ) ? true : false; 254 $can_edit_type_cotation = ( isset( $_POST['edit_type_cotation'] ) && 'true' == $_POST['edit_type_cotation'] ) ? true : false; 255 $can_mask_number_GP_UT = ( isset( $_POST['mask_number_GP_UT'] ) && 'true' == $_POST['mask_number_GP_UT'] ) ? true : false; 256 $general_data_options = ! empty( $_POST['general_options'] ) ? (array) $_POST['general_options'] : array(); 254 257 255 258 $general_options = get_option( \eoxia\Config_Util::$init['digirisk']->general_options, Setting_Class::g()->default_general_options ); … … 258 261 update_option( 'edit_risk_category', $can_edit_risk_category ); 259 262 update_option( 'edit_type_cotation', $can_edit_type_cotation ); 263 update_option( 'mask_number_GP_UT', $can_mask_number_GP_UT ); 260 264 261 265 $general_options['required_duer_day'] = $general_data_options['required_duer_day']; … … 267 271 'module' => 'setting', 268 272 'callback_success' => 'generalSettingsSaved', 269 'url' => admin_url( 'options-general.php?page=digirisk-setting' ),273 //'url' => admin_url( 'options-general.php?page=digirisk-setting' ), 270 274 ) ); 271 275 } -
digirisk/trunk/modules/setting/asset/js/setting.backend.js
r2371149 r2389813 110 110 */ 111 111 window.eoxiaJS.digirisk.setting.generalSettingsSaved = function( triggeredElement, response ) { 112 document.location.href = response.data.url;112 //document.location.href = response.data.url; 113 113 }; 114 114 -
digirisk/trunk/modules/setting/class/class-setting-class.php
r2260627 r2389813 297 297 298 298 } 299 300 public function hide_GP_UT_number( ) { 301 $hide_GP_UT_number = get_option( 'mask_number_GP_UT' ); 302 return $hide_GP_UT_number; 303 } 299 304 } 300 305 -
digirisk/trunk/modules/setting/view/general/main.view.php
r2260627 r2389813 56 56 </div> 57 57 58 <div class="form-element"> 59 <label class="form-field-container"> 60 <div class="form-field-inline"> 61 <input type="checkbox" id="mask_number_GP_UT" class="form-field" name="mask_number_GP_UT" <?php echo $can_mask_number_GP_UT ? 'checked' : ''; ?> /> 62 <label for="mask_number_GP_UT"><?php esc_html_e( 'Hide GP and UT number', 'digirisk' ); ?></label> 63 </div> 64 </label> 65 </div> 66 58 67 <div class="wpeo-button button-main action-input" data-parent="wpeo-form"> 59 68 <span><?php esc_html_e( 'Enregistrer les modifications', 'digirisk' ); ?></span> -
digirisk/trunk/modules/setting/view/main.view.php
r2260627 r2389813 32 32 <?php 33 33 \eoxia\View_Util::exec( 'digirisk', 'setting', 'general/main', array( 34 'can_edit_risk_category' => $can_edit_risk_category, 35 'can_edit_type_cotation' => $can_edit_type_cotation, 36 'general_options' => $general_options, 34 'can_edit_risk_category' => $can_edit_risk_category, 35 'can_edit_type_cotation' => $can_edit_type_cotation, 36 'can_mask_number_GP_UT' => $can_mask_number_GP_UT, 37 'general_options' => $general_options, 37 38 ) ); 38 39 ?> -
digirisk/trunk/readme.txt
r2386921 r2389813 81 81 82 82 - Autres : Corrections sur le logo des protections. 83 - Evaluat eur : Corrections sur la date de l'évaluation.83 - Evaluatuer : Corrections sur la date de l'évaluation. 84 84 - GP/UT : Corrections sur les photos qui ne s'afficher plus. 85 85
Note: See TracChangeset
for help on using the changeset viewer.