Skip to content

Commit

Permalink
Merge pull request #128 from folio-org/v1.5.0
Browse files Browse the repository at this point in the history
Release v1.5.0
  • Loading branch information
AndreiShumski2 authored Sep 11, 2019
2 parents 00a10a8 + acd6b0d commit 1dcc3da
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 29 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Change history for ui-organizations

## [1.5.0](https://github.com/folio-org/ui-organizations/tree/v1.5.0) (2019-09-11)
[Full Changelog](https://github.com/folio-org/ui-organizations/compare/v1.4.0...v1.5.0)

### Stories
* [UIORGS-97](https://issues.folio.org/browse/UIORGS-97) Update the currency list for vendors to rely on the standard currency list

### Bug Fixes
* [UIORGS-87](https://issues.folio.org/browse/UIORGS-87) Unable to assign an interface to an Organization
* [UIOR-367](https://issues.folio.org/browse/UIOR-367) Fix search query

## [1.4.0](https://github.com/folio-org/ui-organizations/tree/v1.4.0) (2019-08-26)
[Full Changelog](https://github.com/folio-org/ui-organizations/compare/v1.3.0...v1.4.0)

Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@folio/organizations",
"version": "1.4.0",
"version": "1.5.0",
"description": "Organizations",
"main": "index.js",
"repository": "folio-org/ui-organizations",
Expand All @@ -19,14 +19,14 @@
"home": "/organizations?sort=Name",
"okapiInterfaces": {
"configuration": "2.0",
"organizations-storage.addresses": "1.0",
"organizations-storage.categories": "1.0",
"organizations-storage.addresses": "1.1",
"organizations-storage.categories": "1.1",
"organizations-storage.contacts": "2.0",
"organizations-storage.emails": "1.0",
"organizations-storage.emails": "1.1",
"organizations-storage.interfaces": "2.0",
"organizations-storage.organizations": "2.0",
"organizations-storage.organizations": "2.1",
"organizations-storage.phone-numbers": "2.0",
"organizations-storage.urls": "1.0",
"organizations-storage.urls": "1.1",
"users": "15.0"
},
"queryResource": "query",
Expand Down
38 changes: 15 additions & 23 deletions src/VendorViews/ViewVendor.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ import PropTypes from 'prop-types';
import _ from 'lodash';
import queryString from 'query-string';
// Folio
import {
IfInterface,
IfPermission,
} from '@folio/stripes/core';
import { IfPermission } from '@folio/stripes/core';
import {
Pane,
PaneMenu,
Expand Down Expand Up @@ -193,25 +190,20 @@ class ViewVendor extends Component {
const lastMenu = (
<PaneMenu>
<IfPermission perm="ui-organizations.edit">
<IfInterface
name="organizations-storage.organizations"
version="2.1 3.0"
>
{tagsEnabled && (
<FormattedMessage id="ui-organizations.showTags">
{(title) => (
<IconButton
ariaLabel={title}
badgeCount={tags.length}
icon="tag"
id="clickable-show-tags"
onClick={tagsToggle}
title={title}
/>
)}
</FormattedMessage>
)}
</IfInterface>
{tagsEnabled && (
<FormattedMessage id="ui-organizations.showTags">
{(title) => (
<IconButton
ariaLabel={title}
badgeCount={tags.length}
icon="tag"
id="clickable-show-tags"
onClick={tagsToggle}
title={title}
/>
)}
</FormattedMessage>
)}
</IfPermission>
<IfPermission perm="ui-organizations.edit">
<FormattedMessage id="ui-organizations.view.edit">
Expand Down

0 comments on commit 1dcc3da

Please sign in to comment.