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.

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

Pull Request: C3_Fadel_211_remove_helping_hints_4.21 #338

Closed
wants to merge 13 commits into from

Conversation

mohamedfadel
Copy link
Collaborator

Issue #211

Fixed previous issues and removed Nadine's part
Please review:
@Rania-Abdel-Fattah @Ahmed-Moataz @Ahmed-Atef @ahmed93 @ranaelnagar

<th style = "width:20%">Delete</th>

<td><%= button_to "Delete", {controller: :hints, action: :destroy, id: hint1.id},
:method => :delete, class: 'btn btn-primary btn-xs' %></td>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fadel1493 please fix indentation in this line

@Ahmed-Atef
Copy link
Collaborator

@fadel1493 code reopen

# [Delete a Hint - Story 4.21]
# This action takes the hint id, removes it from the database
# and then redirects the user to the edit page accompanied
# with a "Hint deleted" message.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fadel1Add a tab in line 7 and 8 instead of a space. It should be like this:

# This action takes the hint id, removes it from the database
#    and then redirects the user to the edit page accompanied
#    with a "Hint deleted" message.

@Ahmed-Moataz
Copy link
Collaborator

@fadel1493 Please check the previous comments. Doc. reopen.

@Ahmed-Moataz
Copy link
Collaborator

@fadel1493 Doc. verified.

flash[:success_deletion] = "Hint deleted."
redirect_to :controller => 'model_answers', :action => 'edit', :id => @@answer_id
end
end
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fadel1493 leave and empty line before last end

@ahmedhagii ahmedhagii added this to the Sprint 1 milestone Apr 24, 2014
@mohamedfadel
Copy link
Collaborator Author

@Ahmed-Atef @Mamdou7 Please review.

@mohamedfadel
Copy link
Collaborator Author

@Rania-Abdel-Fattah @ranaelnagar Please scenario review

@Ahmed-Atef
Copy link
Collaborator

@fadel1493 code verified , fix conflicts with master

@mohamedfadel mohamedfadel changed the title Adding updated and fixed files issue #211 C3_Fadel_211_remove_helping_hints_4.21 Apr 25, 2014
@mohamedfadel
Copy link
Collaborator Author

@KhaledHelmy Please review code, and Atef verified above.

@KhaledHelmy
Copy link
Collaborator

@fadel1493 Ok, but please fix the conflicts with the master first in order to review the new code directly :)

@mohamedfadel
Copy link
Collaborator Author

@KhaledHelmy Fixed. Please review

@mohamedfadel
Copy link
Collaborator Author

Fixed @Ahmed-Atef

@mohamedfadel
Copy link
Collaborator Author

@Ahmed-Atef Please verify if complete

@mohamedfadel
Copy link
Collaborator Author

@Ahmed-Atef Please review

@hashcashier
Copy link
Contributor

@fadel1493 resolve conflicts

@mohamedfadel
Copy link
Collaborator Author

@rami-khalil conflicts resolved

@hashcashier
Copy link
Contributor

@fadel1493 resolve conflicts..

@mohamedfadel
Copy link
Collaborator Author

@rami-khalil conflicts resolved

@@ -52,4 +57,5 @@
</tbody>
</table>
<% end %>
</div>
</div>

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unnecessary line

@Ahmed-Atef
Copy link
Collaborator

@fadel1493 please check comments above

<th style = "width:20%">Delete</th>
<td><%= button_to "Delete",
{controller: :hints, action: :destroy, id: hint1.id},
:method => :delete, class: 'btn btn-primary btn-xs' %></td>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fadel1493 line too long

@mohamedfadel
Copy link
Collaborator Author

@Ahmed-Atef code pending

@Ahmed-Atef
Copy link
Collaborator

@fadel1493 i hate to be that guy but u forgot about the extra line at the end

@mohamedfadel
Copy link
Collaborator Author

@Ahmed-Atef which line?

@Ahmed-Atef
Copy link
Collaborator

@fadel1493 line 62 is extra in the mode_answer/_index

@mohamedfadel
Copy link
Collaborator Author

@Ahmed-Atef done

@Ahmed-Atef
Copy link
Collaborator

@fadel1493 Code verified tag scenario reviewers

@nadineadel
Copy link
Collaborator

@fadel1493 i got this error
fadelerror

@Ahmed-Atef
Copy link
Collaborator

@fadel1493 what is hint1?

@Ahmed-Atef
Copy link
Collaborator

@fadel1493 u r passing the id for your action destroy as hint1.id

@Ahmed-Atef
Copy link
Collaborator

@fadel1493 are you sure that your button should be here ? as there are related to the model answer

@AhmedOsam AhmedOsam closed this May 17, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants