vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Social fixes (#6296)

Browse source 
* Fix image viewer

* Fix social home reload issue

* Set session user if unavailable
This commit is contained in:
Suraj Shetty 2018-10-23 09:53:38 +05:30 • committed by GitHub
parent 725932403a
commit 36483d8e0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
frappe/public/js/frappe/social/components/Post.vue
View file

@ -39,13 +39,6 @@ export default {
PostAction,
PostComment
},
mounted() {
this.$el.querySelectorAll('img').forEach((img) => {
img.addEventListener('click', () => {
this.$root.$emit('show_preview', img.src);
})
});
},
data() {
return {
user_avatar: frappe.avatar(this.post.owner, 'avatar-medium'),
@ -93,12 +86,17 @@ export default {
},
mounted() {
Array.from(this.$refs['content'].getElementsByTagName("a"))
.forEach(link_element => {
// to open link in new tab
link_element.target = 'blank';
this.generate_preview(link_element);
this.$refs['content'].querySelectorAll('img').forEach((img) => {
img.addEventListener('click', () => {
this.$root.$emit('show_preview', img.src);
})
});
this.$refs['content'].querySelectorAll('a').forEach(link_element => {
// to open link in new tab
link_element.target = 'blank';
this.generate_preview(link_element);
})
},
methods: {
goto_profile(user) {

9
frappe/public/js/frappe/social/social_home.js
View file

@ -64,9 +64,14 @@ frappe.social.update_user_image = new frappe.ui.Dialog({
],
primary_action_label: __('Set Image'),
primary_action: (values) => {
frappe.db.set_value('User', frappe.session.user, 'user_image', values.image)
// TODO: check for a better fix
if (!frappe.session.user) {
frappe.session.user = frappe.boot.user.name;
}
const user = frappe.session.user;
frappe.db.set_value('User', user, 'user_image', values.image)
.then((resp) => {
frappe.boot.user_info[frappe.session.user].image = resp.message.user_image;
frappe.boot.user_info[user].image = resp.message.user_image;
frappe.app_updates.trigger('user_image_updated');
frappe.social.update_user_image.clear();
frappe.social.update_user_image.hide();