Skip to content
Snippets Groups Projects
Commit d044b3fe authored by Ghislain Loas's avatar Ghislain Loas
Browse files

dev #79082 : refacto js

parent 1bc48ec0
6 merge requests!2890Master,!2889Master,!2888Master,!2887Master,!2878Dev#79082 explo amelioration du force https,!2873Dev#79082 explo amelioration du force https
Pipeline #5250 failed with stage
in 28 minutes and 3 seconds
......@@ -26,6 +26,8 @@ class Class_UrlManager_Description {
public function getDescription($view) {
return (new Class_TableDescription('urls'))
->addColumn($this->_('URL'), function($instances) use ($view)
{
......@@ -70,6 +72,12 @@ class Class_UrlManager_Description {
$id = $instance->getId();
$url = $instance->getUrl();
$url_request = urlencode($url);
$convert_url = Class_Url::absolute(['module' => 'admin',
'controller' => 'url-manager',
'action' =>'update-url-in-models',
'url' => $url_request,
'by' => urlencode(str_replace('http://',
'https://', $url))],null,true);
$actions = [$view->tagAnchor('#',
Class_Admin_Skin::current()
......@@ -78,15 +86,12 @@ class Class_UrlManager_Description {
['alt' => $this->_('Sélectioner ou déselectionner l\'URL.')]),
['data-id' => $id,
'data-url' => $url,
'data-convert' => $convert_url,
'data-image-selected' => Class_Admin_Skin::current()->getIconUrl('actions', 'active'),
'data-image-not-selected' => Class_Admin_Skin::current()->getIconUrl('actions', 'inactive'),
'data-selected-status' => $instance->getSelectedStatus()]),
$view->tagAnchor($view->url(['controller' => 'url-manager',
'action' =>'update-url-in-models',
'url' => $url_request,
'by' => urlencode(str_replace('http://',
'https://', $url))]),
$view->tagAnchor($convert_url,
Class_Admin_Skin::current()
->renderActionIconOn('test',
$view,
......
......@@ -31,6 +31,40 @@
testProtocolOnAllLinks('https');
});
html.find('[data-selected-status]').click(function(event) {
event.preventDefault();
selectUrl($(this));
});
html.find('#convert_all_http_to_https').click(function(event) {
event.preventDefault();
convertSelectedToHttps();
});
function convertSelectedToHttps() {
$('[data-selected-status="1"]').each(function() {
$.ajax({
url : $(this).attr('data-convert'),
type : "GET",
dataType : "html",
});
});
setTimeout(function() {window.location.reload();}, 1000);
}
function selectUrl(element) {
if (element.attr('data-selected-status') == 1) {
element.find('img').attr('src', element.attr('data-image-not-selected'));
element.attr('data-selected-status', 0);
return true;
}
element.find('img').attr('src', element.attr('data-image-selected'));
element.attr('data-selected-status', 1);
}
function testProtocolOnAllLinks(protocol) {
html.find('div[data-protocol="' + protocol + '"]').each(function() {
var url = $(this).attr('data-url');
......
......@@ -129,7 +129,7 @@ class UrlManagerControllerIndexDispatchWithURLFilteredTest extends UrlManagerTes
/** @test */
public function selectMonCatalogueActionShouldBePresent() {
$this->assertXPath('//td//a[@data-id][@data-url][@data-image-selected][@data-image-not-selected][@data-selected-status]');
$this->assertXPath('//td//a[@data-id][@data-url][@data-image-selected][@data-image-not-selected][@data-selected-status][@data-convert]');
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment