8000 OHRM5X-1754: Fix PIM - ESS attachment download by devishke-orange · Pull Request #1488 · orangehrm/orangehrm · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

OHRM5X-1754: Fix PIM - ESS attachment download #1488

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.

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

Merged
merged 6 commits into from
Oct 13, 2022

Conversation

devishke-orange
Copy link
Contributor
@devishke-orange devishke-orange commented Oct 11, 2022

PR contains:

  • OHRM5X-1754: [Git][PIM] ESS user unable to download files attached by admin user.
  • OHRM5X-1761: [PIM- Data Import] Issues related to Importing records having same employee id and email addresses
  • OHRM5X-1759: [Broken][PIM- Data Import] User is able to import records having the same mail address for both work and other email and a error toast is displayed when the user try to update a email.

image
image

8000
@devishke-orange devishke-orange marked this pull request as ready for review October 13, 2022 09:29
<oxd-dialog
v-if="show"
class="orangehrm-confirmation-dialog orangehrm-dialog-popup"
style="width: 450px"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think .orangehrm-dialog-popup have width defined

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it has max-width defined. I put width to keep the box size consistent since I felt it was too small when only success text was there

</div>
<div
class="orangehrm-text-center-align"
style="overflow-wrap: break-word"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

refactor the style to class please

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it didn't work when putting as a class not sure why

</oxd-text>
<oxd-text v-if="failed > 0" type="card-body">
{{ failedRows.toString() }}
</oxd-text>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<template v-if="failed > 0">
  <oxd-text type="card-body">
    {{ $t('pim.n_records_failed_to_import', {count: failed}) }}
  </oxd-text>
  <oxd-text type="card-body">
    {{ $t('pim.failed_rows') }}
  </oxd-text>
  <oxd-text type="card-body">
    {{ failedRows.toString() }}
  </oxd-text>
</template>

};
</script>

<style
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

better to add a stylesheet for this component.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

copy styles from dialog.scss into a new stylesheet for this component?

8000
this.show = true;
});
},
onConfirm() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since there is no confirmation in this dialog. better to remove these logic and use a simple v-if from parent component to show/hide the modal.

@RajithaKumara RajithaKumara merged commit 3cd1cdf into orangehrm:5.2 Oct 13, 2022
@RajithaKumara
Copy link
Member

Fix for #1459

RajithaKumara added a commit to RajithaKumara/orangehrm that referenced this pull request Oct 17, 2022
RajithaKumara added a commit to RajithaKumara/orangehrm that referenced this pull request Oct 17, 2022
RajithaKumara added a commit that referenced this pull request Oct 17, 2022
* OHRM5X-1791: Add required asterisk marks in LDAP config screen

* OHRM5X-1785: Update changelog

* OHRM5X-1761: Revert EmployeeContactDetailsAPI change in #1488

* OHRM5X-1761: Improve work email and other email validation
Super-Chama pushed a commit to Super-Chama/orangehrm that referenced this pull request Dec 13, 2022
…gehrm#1488)

* OHRM5X-1754: Fix ESS users unable to download PIM attachments

* OHRM5X-1759: [PIM- Data Import] User is able to import records having the same mail address for both work and other email and an error toast is displayed when the user tries to update the email

* OHRM5X-1761: [PIM- Data Import] Issues related to Importing records having same employee id and email addresses
Super-Chama pushed a commit to Super-Chama/orangehrm that referenced this pull request Dec 13, 2022
* OHRM5X-1791: Add required asterisk marks in LDAP config screen

* OHRM5X-1785: Update changelog

* OHRM5X-1761: Revert EmployeeContactDetailsAPI change in orangehrm#1488

* OHRM5X-1761: Improve work email and other email validation
@devishke-orange devishke-orange deleted the OHRM5X-1754 branch February 2, 2024 06:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
0