Skip to content
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.

Sign up for GitHub

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

Jump to bottom

PHRAS-4090:Prod - expose-cli - publication - publication description is Nok #4536

Merged
merged 4 commits into from
Sep 6, 2024
Merged

PHRAS-4090:Prod - expose-cli - publication - publication description is Nok #4536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64d07cd
fix expose publication description
aynsix Jul 23, 2024
5dd1267
Merge branch 'master' into PHRAS-4090-expose-cli-publication-description
nmaillat Jul 24, 2024
fab90eb
fix submit twice on expose cli
aynsix Aug 8, 2024
335b1aa
Merge branch 'master' into PHRAS-4090-expose-cli-publication-description
nmaillat Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions templates/web/prod/WorkZone/ExposeEdit.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@
<form id="publication-data-form-edit" >
<div class="edit-publication-block">
<div class="ui-widget">
<label>{{ 'prod:expose:publication:Name' | trans }}</label>
<input type="text" value="{{ publication.title }}" name="title" class="publication-field"/>
<label for="expose-edit-title">{{ 'prod:expose:publication:Name' | trans }}</label>
<input id="expose-edit-title" type="text" value="{{ publication.title }}" name="title" class="publication-field"/>
</div>
<div class="ui-widget">
<label>{{ 'prod:expose:publication:Slug' | trans }}</label>
<label for="slug-field">{{ 'prod:expose:publication:Slug' | trans }}</label>
<input type="text" data-actual-slug="{{ publication.slug }}" value="{{ publication.slug }}" name="slug" class="publication-field" id="slug-field"/>
<input type="button" class="slug-availability" style="height: 31px;" value="{{ 'prod:expose:publication:check slug' | trans }}">
<img class="expose-slug-ok" src="/assets/common/images/icons/ok.png" style="height: 32px;display:none;" >
<img class="expose-slug-nok" src="/assets/common/images/icons/red-cross.png" style="height: 32px;display:none;">
</div>
<div class="ui-widget">
<label>{{ 'prod:expose:publication:Description' | trans }}</label>
<label for="description">{{ 'prod:expose:publication:Description' | trans }}</label>
<textarea class="publication-field description-field-edit" name="description" id="description" cols="250" rows="5" style="width: 530px;">{{ publication.description }}</textarea>
</div>
<div class="ui-widget">
<label>{{ 'prod:expose:publication:Parent Publication' | trans }}</label>
<label for="publication_parent_edit">{{ 'prod:expose:publication:Parent Publication' | trans }}</label>
<div id="publication-list-data" class="ui-widget publication_parent_wrapper" style="margin-top: 10px;margin-left: 2px;">
{% if publication.parent.id %}
{% set parentId = publication.parent.id %}
Expand All @@ -60,7 +60,7 @@

{% if publication.capabilities.operator %}
<div class="ui-widget profile-wrapper hide">
<label>{{ 'prod:expose:publication:Profile' | trans }}</label>
<label for="profile-field">{{ 'prod:expose:publication:Profile' | trans }}</label>
{% set nbProfile = publication.profile|length %}

<select id="profile-field" name="profile" tabindex="-1" aria-hidden="true"
Expand Down Expand Up @@ -150,7 +150,7 @@
</div>
</form>

<form name="publication-json" id="publication-json" class="text-center">
<form autofocus name="publication-json" id="publication-json" class="text-center">
<div id="advancedSettingBlock">
{# <h4 class="toggleSetting">{{ 'prod:expose:publication:Advanced setting' | trans }}</h4>#}
<div id="advancedSettingInner" class="hidden">
Expand Down Expand Up @@ -397,9 +397,9 @@
success: function (data) {
if (data.success) {
publicationEdit.find("#pub-success").removeClass("hidden").html(data.message);
document.getElementById("publication-data-form-edit").reset();
setTimeout(function(){
$('#DIALOG-expose-edit').dialog('close');
publicationEdit.find("#pub-success").addClass("hidden");
}
, 2000
);
Expand Down
52 changes: 29 additions & 23 deletions templates/web/prod/WorkZone/ExposeNew.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,69 +4,73 @@
<form id="publication-data-form" >
<div class="edit-publication-block">
<div class="ui-widget">
<label>{{ 'prod:expose:publication:Name' | trans }}</label>
<input type="text" value="" name="title" class="publication-field"/>
<label for="expose-add-title">{{ 'prod:expose:publication:Name' | trans }}</label>
<input id="expose-add-title" type="text" value="" name="title" class="publication-field"/>
</div>
<div class="ui-widget">
<label>{{ 'prod:expose:publication:Slug' | trans }}</label>
<label for="new-slug-field">{{ 'prod:expose:publication:Slug' | trans }}</label>
<input type="text" value="" name="slug" class="publication-field" id="new-slug-field"/>
<input type="button" class="new-slug-availability" style="height: 31px;" value="{{ 'prod:expose:publication:check slug' | trans }}">
<img class="new-expose-slug-ok" src="/assets/common/images/icons/ok.png" style="height: 32px;display:none;" >
<img class="new-expose-slug-nok" src="/assets/common/images/icons/red-cross.png" style="height: 32px;display:none;">
</div>
<div class="ui-widget">
<label>{{ 'prod:expose:publication:Description' | trans }}</label>
<label for="description-new">{{ 'prod:expose:publication:Description' | trans }}</label>
<textarea name="description" class="publication-field description-field-new" id="description-new" cols="250" rows="5" style="width: 530px;"></textarea>
</div>
<div class="ui-widget">
<label>{{ 'prod:expose:publication:Parent Publication' | trans }}</label>
<label for="publication_parent">{{ 'prod:expose:publication:Parent Publication' | trans }}</label>
<div id="publication-list-data" class="ui-widget publication_parent_wrapper" style="margin-top: 10px;margin-left: 2px;">
<select id="publication_parent" name="parent">
<option value="">{{ 'prod:expose:publication:Search a parent publication' | trans }}</option>
</select>
</div>
</div>
<div class="ui-widget profile-wrapper hide">
<label>{{ 'prod:expose:publication:Profile' | trans }} </label>
<label for="profile-field">{{ 'prod:expose:publication:Profile' | trans }} </label>
<select id="profile-field" name="profile" tabindex="-1" aria-hidden="true"
class="publication-field">
<option value="">{{ 'prod:expose:publication:Select Profile' | trans }}</option>
</select>
</div>
<div class="ui-widget">
<label>{{ 'prod:expose:publication:Enabled' | trans }}</label>
<label class="switch">
<label for="enabled_combobox">{{ 'prod:expose:publication:Enabled' | trans }}</label>
<span class="switch">
<input id="enabled_combobox" type="checkbox" class="publication-field" name="enabled">
<span class="slider round"></span>
</label>
</span>
</div>
<div class="ui-widget available-wrapper">
<label>{{ 'prod:expose:publication:Available (leave blank for permanet publication)' | trans }}</label>
<div class="available-widget">
<label>{{ 'prod:expose:publication:From' | trans }}</label>
<input type="text" autocomplete="off" value="" name="beginsAt" class="new-use-datepicker publication-field"/>
<label for="beginsAt">
{{ 'prod:expose:publication:From' | trans }}
<input type="text" autocomplete="off" value="" id="beginsAt" name="beginsAt" class="new-use-datepicker publication-field"/>
</label>
</div>
<div class="available-widget">
<label>{{ 'prod:expose:publication:To' | trans }} </label>
<input type="text" autocomplete="off" value="" name="expiresAt" class="new-use-datepicker publication-field"/>
<label for="expiresAt">
{{ 'prod:expose:publication:To' | trans }}
<input type="text" autocomplete="off" value="" id="expiresAt" name="expiresAt" class="new-use-datepicker publication-field"/>
</label>
</div>
</div>
<div class="ui-widget">
<label>{{ 'prod:expose:publication:Publicly listing' | trans }}</label>
<label class="switch">
<label for="publication_publiclyListed" class="switch">
<input id="publication_publiclyListed" type="checkbox" class="publication-field" name="publiclyListed">
<span class="slider round"></span>
</label>
</div>
<div class="ui-widget access-wrapper available-wrapper">
<label>{{ 'prod:expose:publication:Access rules' | trans }}</label>
<label for="publication_securityMethod">{{ 'prod:expose:publication:Access rules' | trans }}</label>
<div class="available-widget">
<select id="publication_securityMethod" name="securityMethod" tabindex="-1" aria-hidden="true"
class="publication-field">
<option value="">{{ 'prod:expose:publication:Open access' | trans }}</option>
<option value="password">{{ 'prod:expose:publication:Password' | trans }}</option>
<option value="authentication">{{ 'prod:expose:publication:Users' | trans }}</option>
</select>
<select id="publication_securityMethod" name="securityMethod" tabindex="-1" aria-hidden="true"
class="publication-field">
<option value="">{{ 'prod:expose:publication:Open access' | trans }}</option>
<option value="password">{{ 'prod:expose:publication:Password' | trans }}</option>
<option value="authentication">{{ 'prod:expose:publication:Users' | trans }}</option>
</select>
</div>
<div class="available-widget ui-widget securityOptions_wrapper visibility-hidden">
<input class="publication-field" type="text" name="password" placeholder="Password"
Expand Down Expand Up @@ -105,7 +109,7 @@
</div>
</form>

<form name="publication-json" id="publication-json" class="text-center">
<form autofocus name="publication-json" id="publication-json" class="text-center">
<div id="advancedSettingBlock">
{# <h4 class="toggleSetting">{{ 'prod:expose:publication:Advanced setting' | trans }}</h4>#}
<div id="advancedSettingInner" class="hidden">
Expand Down Expand Up @@ -394,9 +398,11 @@
success: function (data) {
if (data.success) {
$("#DIALOG-expose-add #pub-success").removeClass("hidden").html(data.message + ": " + data.link);
document.getElementById("publication-data-form").reset();

setTimeout(function(){
document.getElementById("publication-data-form").reset();
$('#DIALOG-expose-add').dialog('close');
$("#DIALOG-expose-add #pub-success").addClass("hidden");
}
, 2000
);
Expand Down
Loading