Merge branch 'corrective-policy' into 'corrective-policy'

Fix app subscription detail showing issue

See merge request entgra/carbon-device-mgt!676
corrective-policy
Dharmakeerthi Lasantha 4 years ago
commit 695023e3e6

@ -27,14 +27,12 @@ import io.swagger.annotations.ExtensionProperty;
import io.swagger.annotations.Info;
import io.swagger.annotations.SwaggerDefinition;
import io.swagger.annotations.Tag;
import org.wso2.carbon.apimgt.annotations.api.Scope;
import org.wso2.carbon.apimgt.annotations.api.Scopes;
import org.wso2.carbon.device.application.mgt.common.ErrorResponse;
import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
import javax.validation.Valid;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@ -64,7 +62,7 @@ import java.util.List;
)
@Scopes(
scopes = {
@org.wso2.carbon.apimgt.annotations.api.Scope(
@Scope(
name = "View Application Subscriptions",
description = "View Application Subscriptions.",
key = "perm:admin:app:subscription:view",

@ -294,14 +294,9 @@ class ReleaseView extends React.Component {
<Divider />
<ReviewContainer uuid={release.uuid} />
</TabPane>
<Authorized
permission="/permission/admin/app-mgt/store/admin/subscription/view"
yes={
<TabPane tab="Subscription Details" key="2">
<SubscriptionDetails uuid={release.uuid} />
</TabPane>
}
/>
<TabPane tab="Subscription Details" key="2">
<SubscriptionDetails uuid={release.uuid} />
</TabPane>
</Tabs>
</div>
</div>

@ -96,10 +96,10 @@ class Login extends React.Component {
const config = this.props.context;
return (
<div className="login">
<div className="background"></div>
<div className="background" />
<div className="content">
<Row>
<Col xs={3} sm={3} md={10}></Col>
<Col xs={3} sm={3} md={10} />
<Col xs={18} sm={18} md={4}>
<Row style={{ marginBottom: 20 }}>
<Col
@ -174,7 +174,7 @@ class Login extends React.Component {
</Col>
</Row>
<Row>
<Col span={4} offset={10}></Col>
<Col span={4} offset={10} />
</Row>
</div>
</div>

Loading…
Cancel
Save