diff --git a/module/productplan/js/view.ui.js b/module/productplan/js/view.ui.js index a5b6d9433a..dcba3fe6b8 100644 --- a/module/productplan/js/view.ui.js +++ b/module/productplan/js/view.ui.js @@ -1,6 +1,9 @@ window.unlinkObject = function(objectType, objectID) { - if(window.confirm(confirmLang[objectType])) $.get(unlinkURL[objectType].replace('%s', objectID), function(){loadPage(locateURL[objectType])}); + zui.Modal.confirm({message: confirmLang[objectType], icon:'icon-info-sign', iconClass: 'warning-pale rounded-full icon-2x'}).then((res) => + { + if(res) $.get(unlinkURL[objectType].replace('%s', objectID), function(){loadPage(locateURL[objectType])}); + }); }; window.renderStoryCell = function(result, info) @@ -19,7 +22,10 @@ window.ajaxConfirmLoad = function(obj) { var $this = $(obj); var action = $this.data('action'); - if(window.confirm(confirmLang[action])) $.get($this.data('url'), function(){loadPage(locateURL[type])}); + zui.Modal.confirm({message: confirmLang[action], icon:'icon-info-sign', iconClass: 'warning-pale rounded-full icon-2x'}).then((res) => + { + if(res) $.get($this.data('url'), function(){loadCurrentPage()}); + }); }; window.showLink = function(obj) diff --git a/module/program/js/project.ui.js b/module/program/js/project.ui.js index dd10b21996..57f11d1ccb 100644 --- a/module/program/js/project.ui.js +++ b/module/program/js/project.ui.js @@ -5,6 +5,14 @@ $(document).on('click', '#involved', function() loadCurrentPage(); }); +window.confirmDelete = function(projectID, projectName) +{ + zui.Modal.confirm({message: confirmDeleteTip.replace('%s', projectName), icon:'icon-info-sign', iconClass: 'warning-pale rounded-full icon-2x'}).then((res) => + { + if(res) $.ajaxSubmit({url: $.createLink('project', 'delete', 'projectID=' + projectID)}); + }); +} + $(document).on('click', '.batch-btn', function() { const dtable = zui.DTable.query($(this).target); diff --git a/module/program/ui/project.html.php b/module/program/ui/project.html.php index 804dbd9257..ad8c6a4692 100644 --- a/module/program/ui/project.html.php +++ b/module/program/ui/project.html.php @@ -1,6 +1,8 @@ project->confirmDelete); + featureBar ( set::current($browseType), diff --git a/module/projectstory/control.php b/module/projectstory/control.php index 7425b5f2b7..cd8754d8bf 100644 --- a/module/projectstory/control.php +++ b/module/projectstory/control.php @@ -49,6 +49,7 @@ class projectStory extends control $this->session->set('exportProductList', $this->products); if(empty($this->products)) $this->locate($this->createLink('product', 'showErrorNone', 'moduleName=project&activeMenu=story&projectID=' . $projectID)); + if(empty($productID)) $productID = key($this->products); echo $this->fetch('product', 'browse', array (