Skip to content

Commit

Permalink
Merged Hotfix into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Alvyre committed Feb 9, 2017
2 parents 6941e72 + 2f755f8 commit 8d9c628
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Front/src/view/about.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
When you arrive on the default page, which is the homepage, you can see all the current information. To interact with other students, create information or join events you have to create an account. You can register by navigate into "Sign-up" in the menu.</p>
<p>When you're logged, you can vote up/down information, "up" if you find them usefull, and "down" if you find them useless. This feature allows us to select and show pertinent information for the whole community !</p>
<p>You can also watch closer information by clicking on it. You will arrive on a detailed page of the information you selected. If it is an event, you will be able to join or leave it. If you are the owner (creator), you will be able to manage and modify it.</p>
<p>If you look closely you will find a <i class="fa fa-bell-o pull-right notif" style="line-height: 21px;" aria-hidden="true"></i> on the top right corner of the title. You can subscribe to the information by clicking on it (you have to accept notifications before).</p>
<p>If you look closely you will find a <i class="fa fa-bell-o" style="line-height: 21px;" aria-hidden="true"></i> on the top right corner of the title. You can subscribe to the information by clicking on it (you have to accept notifications before).</p>
<p>You can modify your personal information in your profile page. You can also delete your account, but be carefull! This action is definitive!</p>
<p>To add an info, just click on the "add info" button, and fill-up the form. When you finished, just submit and it's done!</p><br>
<h4><u>I found a bug, how can I report it?</u></h4>
Expand Down
2 changes: 1 addition & 1 deletion Front/src/view/info.vue
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ export default {
//Triggered when an info is deleted on the server
deleteInfo (info) {
console.log('socket:deleteinfo');
if(this.infoData._id == info._id && this.infoData.userID != Cookie.getCookie('userID')) {
if(this.infoData._id == info._id && this.infoData.userID !== Cookie.getCookie('userID')) {
alert('Sorry, this info just has beed deleted, you will be redirected');
this.$router.push('/');
}
Expand Down
2 changes: 1 addition & 1 deletion Front/src/view/user.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
mounted () {
//Get user info and set the loading animation
$.commit('loadingOn');
this.$store.commit('loadingOn');
this.fetchUserProfile();
},
methods: {
Expand Down

0 comments on commit 8d9c628

Please sign in to comment.