Skip to content

Commit f31d818

Browse files
committed
pkp/pkp-lib#9295 composbale for issue assignment and added namespace(submission and publication) for status const
1 parent 98ddbef commit f31d818

30 files changed

+447
-582
lines changed

public/globals.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,18 @@ window.pkp = {
9696
ROLE_ID_SUB_EDITOR: 17,
9797
ROLE_ID_SUBSCRIPTION_MANAGER: 2097152,
9898
STAGE_STATUS_SUBMISSION_UNASSIGNED: 1,
99-
STATUS_QUEUED: 1,
100-
STATUS_PUBLISHED: 3,
101-
STATUS_DECLINED: 4,
102-
STATUS_SCHEDULED: 5,
103-
PUBLICATION_STATUS_QUEUED: 1,
104-
PUBLICATION_STATUS_PUBLISHED: 3,
105-
PUBLICATION_STATUS_DECLINED: 4,
106-
PUBLICATION_STATUS_SCHEDULED: 5,
99+
submission: {
100+
STATUS_QUEUED: 1,
101+
STATUS_PUBLISHED: 3,
102+
STATUS_DECLINED: 4,
103+
STATUS_SCHEDULED: 5,
104+
},
105+
publication: {
106+
STATUS_QUEUED: 1,
107+
STATUS_PUBLISHED: 3,
108+
STATUS_DECLINED: 4,
109+
STATUS_SCHEDULED: 5,
110+
},
107111
WORKFLOW_STAGE_ID_SUBMISSION: 1,
108112
WORKFLOW_STAGE_ID_INTERNAL_REVIEW: 2,
109113
WORKFLOW_STAGE_ID_EXTERNAL_REVIEW: 3,

src/components/Form/Form.vue

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
@show-locale="showLocale"
7272
@cancel="cancel"
7373
@set-errors="setErrors"
74-
@set-field-required="setFieldRequired"
7574
/>
7675
</div>
7776
</form>
@@ -162,7 +161,6 @@ export default {
162161
currentPage: '',
163162
isSaving: false,
164163
lastSaveTimestamp: -1,
165-
fieldRequiredStates: {}, // track field required states for dynamic fields
166164
};
167165
},
168166
computed: {
@@ -388,16 +386,6 @@ export default {
388386
return;
389387
}
390388
391-
// Check if field has custom required state
392-
if (field.name in this.fieldRequiredStates) {
393-
const isFieldRequired = this.fieldRequiredStates[field.name];
394-
// check if Field is required by dynamic update and return if not
395-
// otherwise continue with default checks
396-
if (!isFieldRequired) {
397-
return;
398-
}
399-
}
400-
401389
let missingValue = false;
402390
403391
// Only require the primary locale by default for multilingual fields

src/components/Form/FormGroup.vue

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ import FieldRichTextarea from './fields/FieldRichTextarea.vue';
9191
import FieldRichText from './fields/FieldRichText.vue';
9292
import FieldSelect from './fields/FieldSelect.vue';
9393
import FieldSelectIssues from './fields/FieldSelectIssues.vue';
94-
import FieldIssueSelection from './fields/FieldIssueSelection.vue';
9594
import FieldSelectSubmissions from './fields/FieldSelectSubmissions.vue';
9695
import FieldSelectUsers from './fields/FieldSelectUsers.vue';
9796
import FieldShowEnsuringLink from './fields/FieldShowEnsuringLink.vue';
@@ -128,7 +127,6 @@ export default {
128127
FieldRichText,
129128
FieldSelect,
130129
FieldSelectIssues,
131-
FieldIssueSelection,
132130
FieldSelectSubmissions,
133131
FieldSelectUsers,
134132
FieldShowEnsuringLink,
@@ -242,13 +240,6 @@ export default {
242240
}
243241
this.$emit('set-errors', {...newErrors});
244242
},
245-
246-
/**
247-
* Forward field required events to the form page
248-
*/
249-
setFieldRequired: function (fieldName, isRequired) {
250-
this.$emit('set-field-required', fieldName, isRequired);
251-
},
252243
},
253244
};
254245
</script>

src/components/Form/FormPage.vue

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -235,13 +235,6 @@ export default {
235235
setErrors: function (errors) {
236236
this.$emit('set-errors', errors);
237237
},
238-
239-
/**
240-
* Forward field required events to the form
241-
*/
242-
setFieldRequired: function (fieldName, isRequired) {
243-
this.$emit('set-field-required', fieldName, isRequired);
244-
},
245238
},
246239
};
247240
</script>

0 commit comments

Comments
 (0)