diff options
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/js/menu/content.js | 32 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.pageProperties.xml | 5 |
2 files changed, 16 insertions, 21 deletions
diff --git a/addons/website/static/src/js/menu/content.js b/addons/website/static/src/js/menu/content.js index 0de22ca0059..3fe01322745 100644 --- a/addons/website/static/src/js/menu/content.js +++ b/addons/website/static/src/js/menu/content.js @@ -79,15 +79,11 @@ var PagePropertiesDialog = weWidgets.Dialog.extend({ defs.push(this._rpc({ model: 'website.page', - method: 'read', - args: [ - this.page_id, - ['id', 'name', 'url', 'website_published', 'website_indexed', 'date_publish', - 'menu_ids', 'is_homepage', 'website_id', 'visibility', 'visibility_password', 'visibility_group'] - ], + method: 'get_page_properties', + args: [this.page_id], }).then(function (page) { - page[0].url = _.str.startsWith(page[0].url, '/') ? page[0].url.substring(1) : page[0].url; - self.page = page[0]; + page.url = _.str.startsWith(page.url, '/') ? page.url.substring(1) : page.url; + self.page = page; })); return Promise.all(defs); @@ -206,13 +202,13 @@ var PagePropertiesDialog = weWidgets.Dialog.extend({ }); var url = this.$('#page_url').val(); - var $date_publish = this.$("#date_publish"); - $date_publish.closest(".form-group").removeClass('o_has_error').find('.form-control, .custom-select').removeClass('is-invalid'); - var date_publish = $date_publish.val(); - if (date_publish !== "") { - date_publish = this._parse_date(date_publish); - if (!date_publish) { - $date_publish.closest(".form-group").addClass('o_has_error').find('.form-control, .custom-select').addClass('is-invalid'); + var $datePublish = this.$("#date_publish"); + $datePublish.closest(".form-group").removeClass('o_has_error').find('.form-control, .custom-select').removeClass('is-invalid'); + var datePublish = $datePublish.val(); + if (datePublish !== "") { + datePublish = this._parse_date(datePublish); + if (!datePublish) { + $datePublish.closest(".form-group").addClass('o_has_error').find('.form-control, .custom-select').addClass('is-invalid'); return; } } @@ -228,9 +224,9 @@ var PagePropertiesDialog = weWidgets.Dialog.extend({ redirect_type: this.$('#redirect_type').val(), website_indexed: this.$('#is_indexed').prop('checked'), visibility: this.$('#visibility').val(), - visibility_password: this.$('#visibility_password').val(), - visibility_group: this.$('#visibility_group').data('group-id'), - date_publish: date_publish, + visibility_password: this.$('#visibility').val() === 'password' ? this.$('#visibility_password').val() : false, + visibility_group: this.$('#visibility').val() === 'restricted_group' ? this.$('#visibility_group').data('group-id') : false, + date_publish: datePublish, }; this._rpc({ model: 'website.page', diff --git a/addons/website/static/src/xml/website.pageProperties.xml b/addons/website/static/src/xml/website.pageProperties.xml index 2a10cd3ed77..f1e891a5be0 100644 --- a/addons/website/static/src/xml/website.pageProperties.xml +++ b/addons/website/static/src/xml/website.pageProperties.xml @@ -145,10 +145,9 @@ <div class="input-group"> <select id="visibility" class="form-control col-md-4"> <option value="" t-att-selected="widget.page.visibility == ''">Public</option> - <option value="connected" t-att-selected="widget.page.visibility == 'connected' ? 'selected' : undefined">Connected</option> - <option value="restricted_group" t-att-selected="widget.page.visibility == 'restricted_group' ? 'selected' : undefined">Has Group</option> + <option value="connected" t-att-selected="widget.page.visibility == 'connected' ? 'selected' : undefined">Signed In</option> + <option value="restricted_group" t-att-selected="widget.page.visibility == 'restricted_group' ? 'selected' : undefined">Some Users</option> <option value="password" t-att-selected="widget.page.visibility == 'password' ? 'selected' : undefined">Password</option> - <option value="employee" t-att-selected="widget.page.visibility == 'employee' ? 'selected' : undefined">Internal users</option> </select> <div class="ml-1 input-group-prepend show_visibility_password" > <div class="input-group-text"><i class="fa fa-key"></i></div> |