hostsharing/hs.hsadmin.ng
1
0
Fork 0
Code Activity

accessrights.jdl: UserRoleAssignments entity*Id required

Browse Source
This commit is contained in:
Michael Hoennig
2019-05-07 12:54:39 +02:00
parent 6df2cbce0b
commit bac012f9b4
33 changed files with 298 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/hostsharing/hsadminng/domain/UserRoleAssignment.java
View File

@ -25,10 +25,13 @@ public class UserRoleAssignment implements Serializable {
@SequenceGenerator(name = "sequenceGenerator")
private Long id;
@Column(name = "entity_type_id")
@NotNull
@Size(max = 32)
@Column(name = "entity_type_id", length = 32, nullable = false)
private String entityTypeId;
@Column(name = "entity_object_id")
@NotNull
@Column(name = "entity_object_id", nullable = false)
private Long entityObjectId;
@NotNull

4
src/main/jdl/accessrights.jdl
View File

@ -12,8 +12,8 @@ enum UserRole {
}
entity UserRoleAssignment {
entityTypeId String,
entityObjectId Long,
entityTypeId String required maxlength(32),
entityObjectId Long required,
assignedRole UserRole required
}

2
src/main/resources/config/liquibase/changelog/20190430152136_added_entity_Customer.xml → src/main/resources/config/liquibase/changelog/20190507105332_added_entity_Customer.xml
View File

@ -16,7 +16,7 @@
<!--
Added the entity Customer.
-->
<changeSet id="20190430152136-1" author="jhipster">
<changeSet id="20190507105332-1" author="jhipster">
<createTable tableName="customer">
<column name="id" type="bigint" autoIncrement="${autoIncrement}">
<constraints primaryKey="true" nullable="false"/>

2
src/main/resources/config/liquibase/changelog/20190430152137_added_entity_Membership.xml → src/main/resources/config/liquibase/changelog/20190507105333_added_entity_Membership.xml
View File

@ -16,7 +16,7 @@
<!--
Added the entity Membership.
-->
<changeSet id="20190430152137-1" author="jhipster">
<changeSet id="20190507105333-1" author="jhipster">
<createTable tableName="membership">
<column name="id" type="bigint" autoIncrement="${autoIncrement}">
<constraints primaryKey="true" nullable="false"/>

2
src/main/resources/config/liquibase/changelog/20190430152137_added_entity_constraints_Membership.xml → src/main/resources/config/liquibase/changelog/20190507105333_added_entity_constraints_Membership.xml
View File

@ -6,7 +6,7 @@
<!--
Added the constraints for entity Membership.
-->
<changeSet id="20190430152137-2" author="jhipster">
<changeSet id="20190507105333-2" author="jhipster">
<addForeignKeyConstraint baseColumnNames="customer_id"
baseTableName="membership"

2
src/main/resources/config/liquibase/changelog/20190430152138_added_entity_Share.xml → src/main/resources/config/liquibase/changelog/20190507105334_added_entity_Share.xml
View File

@ -16,7 +16,7 @@
<!--
Added the entity Share.
-->
<changeSet id="20190430152138-1" author="jhipster">
<changeSet id="20190507105334-1" author="jhipster">
<createTable tableName="share">
<column name="id" type="bigint" autoIncrement="${autoIncrement}">
<constraints primaryKey="true" nullable="false"/>

2
src/main/resources/config/liquibase/changelog/20190430152138_added_entity_constraints_Share.xml → src/main/resources/config/liquibase/changelog/20190507105334_added_entity_constraints_Share.xml
View File

@ -6,7 +6,7 @@
<!--
Added the constraints for entity Share.
-->
<changeSet id="20190430152138-2" author="jhipster">
<changeSet id="20190507105334-2" author="jhipster">
<addForeignKeyConstraint baseColumnNames="membership_id"
baseTableName="share"

2
src/main/resources/config/liquibase/changelog/20190430152139_added_entity_Asset.xml → src/main/resources/config/liquibase/changelog/20190507105335_added_entity_Asset.xml
View File

@ -16,7 +16,7 @@
<!--
Added the entity Asset.
-->
<changeSet id="20190430152139-1" author="jhipster">
<changeSet id="20190507105335-1" author="jhipster">
<createTable tableName="asset">
<column name="id" type="bigint" autoIncrement="${autoIncrement}">
<constraints primaryKey="true" nullable="false"/>

2
src/main/resources/config/liquibase/changelog/20190430152139_added_entity_constraints_Asset.xml → src/main/resources/config/liquibase/changelog/20190507105335_added_entity_constraints_Asset.xml
View File

@ -6,7 +6,7 @@
<!--
Added the constraints for entity Asset.
-->
<changeSet id="20190430152139-2" author="jhipster">
<changeSet id="20190507105335-2" author="jhipster">
<addForeignKeyConstraint baseColumnNames="membership_id"
baseTableName="asset"

2
src/main/resources/config/liquibase/changelog/20190430152140_added_entity_SepaMandate.xml → src/main/resources/config/liquibase/changelog/20190507105336_added_entity_SepaMandate.xml
View File

@ -16,7 +16,7 @@
<!--
Added the entity SepaMandate.
-->
<changeSet id="20190430152140-1" author="jhipster">
<changeSet id="20190507105336-1" author="jhipster">
<createTable tableName="sepa_mandate">
<column name="id" type="bigint" autoIncrement="${autoIncrement}">
<constraints primaryKey="true" nullable="false"/>

2
src/main/resources/config/liquibase/changelog/20190430152140_added_entity_constraints_SepaMandate.xml → src/main/resources/config/liquibase/changelog/20190507105336_added_entity_constraints_SepaMandate.xml
View File

@ -6,7 +6,7 @@
<!--
Added the constraints for entity SepaMandate.
-->
<changeSet id="20190430152140-2" author="jhipster">
<changeSet id="20190507105336-2" author="jhipster">
<addForeignKeyConstraint baseColumnNames="customer_id"
baseTableName="sepa_mandate"

8
src/main/resources/config/liquibase/changelog/20190430154711_added_entity_UserRoleAssignment.xml → src/main/resources/config/liquibase/changelog/20190507105342_added_entity_UserRoleAssignment.xml
View File

@ -16,17 +16,17 @@
<!--
Added the entity UserRoleAssignment.
-->
<changeSet id="20190430154711-1" author="jhipster">
<changeSet id="20190507105342-1" author="jhipster">
<createTable tableName="user_role_assignment">
<column name="id" type="bigint" autoIncrement="${autoIncrement}">
<constraints primaryKey="true" nullable="false"/>
</column>
<column name="entity_type_id" type="varchar(255)">
<constraints nullable="true" />
<column name="entity_type_id" type="varchar(32)">
<constraints nullable="false" />
</column>
<column name="entity_object_id" type="bigint">
<constraints nullable="true" />
<constraints nullable="false" />
</column>
<column name="assigned_role" type="varchar(255)">

2
src/main/resources/config/liquibase/changelog/20190430154711_added_entity_constraints_UserRoleAssignment.xml → src/main/resources/config/liquibase/changelog/20190507105342_added_entity_constraints_UserRoleAssignment.xml
View File

@ -6,7 +6,7 @@
<!--
Added the constraints for entity UserRoleAssignment.
-->
<changeSet id="20190430154711-2" author="jhipster">
<changeSet id="20190507105342-2" author="jhipster">
<addForeignKeyConstraint baseColumnNames="user_id"
baseTableName="user_role_assignment"

22
src/main/resources/config/liquibase/master.xml
View File

@ -5,17 +5,17 @@
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
<include file="config/liquibase/changelog/00000000000000_initial_schema.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190430152136_added_entity_Customer.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190430152137_added_entity_Membership.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190430152138_added_entity_Share.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190430152139_added_entity_Asset.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190430152140_added_entity_SepaMandate.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190430154711_added_entity_UserRoleAssignment.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190507105332_added_entity_Customer.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190507105333_added_entity_Membership.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190507105334_added_entity_Share.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190507105335_added_entity_Asset.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190507105336_added_entity_SepaMandate.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190507105342_added_entity_UserRoleAssignment.xml" relativeToChangelogFile="false"/>
<!-- jhipster-needle-liquibase-add-changelog - JHipster will add liquibase changelogs here -->
<include file="config/liquibase/changelog/20190430152137_added_entity_constraints_Membership.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190430152138_added_entity_constraints_Share.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190430152139_added_entity_constraints_Asset.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190430152140_added_entity_constraints_SepaMandate.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190430154711_added_entity_constraints_UserRoleAssignment.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190507105333_added_entity_constraints_Membership.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190507105334_added_entity_constraints_Share.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190507105335_added_entity_constraints_Asset.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190507105336_added_entity_constraints_SepaMandate.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20190507105342_added_entity_constraints_UserRoleAssignment.xml" relativeToChangelogFile="false"/>
<!-- jhipster-needle-liquibase-add-constraints-changelog - JHipster will add liquibase constraints changelogs here -->
</databaseChangeLog>

24
src/main/webapp/app/entities/user-role-assignment/user-role-assignment-update.component.html
View File

@ -12,12 +12,32 @@
<div class="form-group">
<label class="form-control-label" jhiTranslate="hsadminNgApp.userRoleAssignment.entityTypeId" for="field_entityTypeId">Entity Type Id</label>
<input type="text" class="form-control" name="entityTypeId" id="field_entityTypeId"
[(ngModel)]="userRoleAssignment.entityTypeId" />
[(ngModel)]="userRoleAssignment.entityTypeId" required maxlength="32"/>
<div [hidden]="!(editForm.controls.entityTypeId?.dirty && editForm.controls.entityTypeId?.invalid)">
<small class="form-text text-danger"
[hidden]="!editForm.controls.entityTypeId?.errors?.required" jhiTranslate="entity.validation.required">
This field is required.
</small>
<small class="form-text text-danger"
[hidden]="!editForm.controls.entityTypeId?.errors?.maxlength" jhiTranslate="entity.validation.maxlength" [translateValues]="{ max: 32 }">
This field cannot be longer than 32 characters.
</small>
</div>
</div>
<div class="form-group">
<label class="form-control-label" jhiTranslate="hsadminNgApp.userRoleAssignment.entityObjectId" for="field_entityObjectId">Entity Object Id</label>
<input type="number" class="form-control" name="entityObjectId" id="field_entityObjectId"
[(ngModel)]="userRoleAssignment.entityObjectId" />
[(ngModel)]="userRoleAssignment.entityObjectId" required/>
<div [hidden]="!(editForm.controls.entityObjectId?.dirty && editForm.controls.entityObjectId?.invalid)">
<small class="form-text text-danger"
[hidden]="!editForm.controls.entityObjectId?.errors?.required" jhiTranslate="entity.validation.required">
This field is required.
</small>
<small class="form-text text-danger"
[hidden]="!editForm.controls.entityObjectId?.errors?.number" jhiTranslate="entity.validation.number">
This field should be a number.
</small>
</div>
</div>
<div class="form-group">
<label class="form-control-label" jhiTranslate="hsadminNgApp.userRoleAssignment.assignedRole" for="field_assignedRole">Assigned Role</label>

6
src/main/webapp/i18n/de/global.json
View File

@ -1,7 +1,8 @@
{
"global": {
"title": "HsadminNg",
"browsehappy": "Sie benutzen einen <strong>veralteten</strong> Browser. Bitte <a href=\"http://browsehappy.com/?locale=de/\">aktualisieren Sie Ihren Browser</a>, um die Benutzerfreundlichkeit zu erhöhen.",
"browsehappy":
"Sie benutzen einen <strong>veralteten</strong> Browser. Bitte <a href=\"http://browsehappy.com/?locale=de/\">aktualisieren Sie Ihren Browser</a>, um die Benutzerfreundlichkeit zu erhöhen.",
"menu": {
"home": "Startseite",
"jhipster-needle-menu-add-element": "JHipster will add additional menu entries here (do not translate!)",
@ -56,7 +57,8 @@
"authenticated": {
"prefix": "Wenn Sie sich ",
"link": "anmelden",
"suffix": " möchten, versuchen Sie es mit <br/>- Administrator (Name=\"admin\" und Passwort=\"admin\")<br/>- Benutzer (Name=\"user\" und Passwort=\"user\")."
"suffix":
" möchten, versuchen Sie es mit <br/>- Administrator (Name=\"admin\" und Passwort=\"admin\")<br/>- Benutzer (Name=\"user\" und Passwort=\"user\")."
},
"register": {
"noaccount": "Sie haben noch keinen Zugang?",

6
src/main/webapp/i18n/en/global.json
View File

@ -1,7 +1,8 @@
{
"global": {
"title": "HsadminNg",
"browsehappy": "You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/?locale=en\">upgrade your browser</a> to improve your experience.",
"browsehappy":
"You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/?locale=en\">upgrade your browser</a> to improve your experience.",
"menu": {
"home": "Home",
"jhipster-needle-menu-add-element": "JHipster will add additional menu entries here (do not translate!)",
@ -56,7 +57,8 @@
"authenticated": {
"prefix": "If you want to ",
"link": "sign in",
"suffix": ", you can try the default accounts:<br/>- Administrator (login=\"admin\" and password=\"admin\") <br/>- User (login=\"user\" and password=\"user\")."
"suffix":
", you can try the default accounts:<br/>- Administrator (login=\"admin\" and password=\"admin\") <br/>- User (login=\"user\" and password=\"user\")."
},
"register": {
"noaccount": "You don't have an account yet?",