Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug/ivyportal 18043 cannot remove edit process widget which contains wrong process #1273

Merged
merged 3 commits into from
Nov 28, 2024
Merged

Bug/ivyportal 18043 cannot remove edit process widget which contains wrong process #1273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95649dc
bug/IVYPORTAL-18043-Cannot-remove-edit-process-widget-which-contains-…
lmluat-axonivy Nov 26, 2024
209b145
bug/IVYPORTAL-18043-Cannot-remove-edit-process-widget-which-contains-…
lmluat-axonivy Nov 26, 2024
da51fc5
bug/IVYPORTAL-18043-Cannot-remove-edit-process-widget-which-contains-…
lmluat-axonivy Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../src_hd/ch/ivy/addon/portal/generic/dashboard/component/ProcessWidget/ProcessWidget.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
</ui:include>
</ui:fragment>

<h:panelGroup id="empty-process"
<h:panelGroup id="empty-process" styleClass="h-full"
rendered="#{(displayMode eq 'COMBINED_MODE' or displayMode eq 'FULL_MODE' or displayMode eq 'IMAGE_MODE') and widget.process eq null}">
<h:panelGroup id="empty-process-actions" rendered="#{!isReadOnlyMode}" styleClass="process-grid-item__action--combined">
<p:commandButton id="empty-process-edit-widget" styleClass="rounded-button ui-button-outlined u-mar-right-5" global="false" icon="si si-pencil"
Expand All @@ -136,7 +136,7 @@
trackMouse="true" hideEvent="mouseleave click" />
</h:panelGroup>

<h:panelGroup styleClass="process-dashboard-widget__empty-process empty-message-container" layout="block">
<h:panelGroup styleClass="process-dashboard-widget__empty-process empty-message-container static" layout="block">
<i class="#{widget.hasPermissionToSee ? 'si si-alert-circle' : 'si si-lock-1'} empty-message-icon" />
<br />
<h:outputText value="#{widget.emptyProcessMessage}" styleClass="empty-message-text" />
Expand Down
2 changes: 1 addition & 1 deletion ...l/generic/dashboard/component/ProcessWidgetConfiguration/ProcessWidgetConfiguration.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@

<!-- Preview -->
<h:panelGroup id="widget-preview" styleClass="card widget-preview widget-preview--process" layout="block">
<div class="ui-g #{isCompact ? 'widget-preview--compact' : ''} #{isFull ? 'widget-preview--full' : ''} #{isCombined ? 'widget-preview--combined' : ''} #{isImage ? 'widget-preview--image-width' : ''}">
<div class="ui-g #{isCompact ? 'widget-preview--compact' : ''} #{isFull ? 'widget-preview--full h-full' : ''} #{isCombined ? 'widget-preview--combined h-full' : ''} #{isImage ? 'widget-preview--image-width' : ''}">
<div class="ui-g-12 widget-preview__header">
<h2>#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/preview')}</h2>
<h:outputText value="#{ivy.cms.co('/Dialogs/ch/ivy/addon/portal/generic/dashboard/component/ProcessWidgetConfiguration/DragAndDropToChangeOrder')}"
Expand Down
14 changes: 7 additions & 7 deletions ...src_hd/ch/ivy/addon/portalkit/component/process/ProcessItemAction/ProcessItemAction.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,19 @@
actionListener="#{cc.attrs.actionListenerOnEditProcess}"
update="#{cc.attrs.componentToUpdateOnEditProcess}"
rendered="#{canModify}" />
<p:menuitem id="delete-process"
value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/delete')}"
icon="si si-bin-1"
oncomplete="#{cc.attrs.onCompleteDeleteProcess}"
actionListener="#{cc.attrs.actionListenerOnDeleteProcess}"
update="#{cc.attrs.componentToUpdateOnDeleteProcess}"
rendered="#{canModify}" />
<p:menuitem id="more-information"
icon="si si-information-circle"
url="#{processWidgetBean.getProcessInformationPageUrl(process)}"
value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/processwidget/MoreInformation')}"
disabled="#{!cc.attrs.isReadOnlyMode or cc.attrs.isInConfiguration}"
rendered="#{processWidgetBean.isShowInformationLink(process) and !isExternalLink and !isCaseMap}"/>
<p:menuitem id="delete-process"
value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/delete')}"
icon="si si-bin-1" styleClass="color-destroy"
oncomplete="#{cc.attrs.onCompleteDeleteProcess}"
actionListener="#{cc.attrs.actionListenerOnDeleteProcess}"
update="#{cc.attrs.componentToUpdateOnDeleteProcess}"
rendered="#{canModify}" />
</p:menu>
</h:panelGroup>
<div class="start-process" id="start-button-wrap-#{cc.attrs.status.index}" >
Expand Down
5 changes: 3 additions & 2 deletions AxonIvyPortal/portal/webContent/resources/css/dashboard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,6 +1096,7 @@ body .ui-widget.new-widget-dialog__introduction {
align-content: center;
width: 100%;
height: 90%;
display: grid;
}

.process-dashboard-widget__empty-process.empty-message-container {
Expand Down Expand Up @@ -1170,9 +1171,9 @@ body .ui-widget.new-widget-dialog__introduction {
}

.process-grid-item__action--combined {
padding: 20px;
padding-bottom: 0;
padding: 8px;
float: right;
height: 10%
}

.process-widget--combined {
Expand Down
Loading