Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
V
VenJob
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Đường Sỹ Hoàng
  • VenJob
  • Merge Requests
  • !13

Open
Opened Jan 17, 2020 by Đường Sỹ Hoàng@hoangds 
  • Report abuse
Report abuse

Feature/remove favorite job,show applied jobs

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b feature/remove_favorite_job,show_applied_jobs origin/feature/remove_favorite_job,show_applied_jobs

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff feature/remove_favorite_job,show_applied_jobs

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 5
  • Commits 5
  • Changes 14
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 0da11390 - Delete unuse files

    Compare with previous version

    Jan 17, 2020

    added 1 commit

    • 0da11390 - Delete unuse files

    Compare with previous version

    added 1 commit * 0da11390 - Delete unuse files [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/13/diffs?diff_id=4675&start_sha=191a806f17de4b7aa4be1ff1de28145535e89adc)
    Toggle commit list
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Jan 17, 2020
    Last updated by Đường Sỹ Hoàng Jan 17, 2020
    app/views/apply/index.html.erb 0 → 100644
    1 <div class="area-title-wrapper">
    2 <h3>Applied Jobs List</h3>
    3 </div>
    4 <div>
    5 <%= paginate @applies %>
    6 <div class="row row-cols-3">
    7 <%= render partial: "apply/applied", collection: @applies %>
    • Son Do Hong @sondh commented Jan 17, 2020
      Master

      nên đặt tên file này là apply, tương đương với model Apply

      nên đặt tên file này là apply, tương đương với model Apply
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 3 of the diff

      Jan 17, 2020

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/13/diffs?diff_id=4676&start_sha=0da1139050b0729fd6c808ef2b273f6bbb240be9#183b857b7ea4feb420ca8ca6b3d8415c83306b32_7_7)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Jan 17, 2020
    Last updated by Đường Sỹ Hoàng Jan 17, 2020
    app/views/jobs/show.html.erb
    49 49 <dt class="col-sm-3">Requirement:</dt>
    50 50 <dd class="col-sm-9"><%= simple_format @job.requirement %></dd>
    51 51 </dl>
    52 <%= link_to "Apply", apply_path, class: "btn btn-primary" %>
    53 <%= render "favorites/favorite_form", job: @job %>
    52 <%= link_to_if(current_user.applies.find_by(job_id: @job.id).nil?, "Apply", apply_path, class: "btn btn-primary") { link_to "Apply", apply_path, class: "btn btn-primary disabled"} %>
    • Son Do Hong @sondh commented Jan 17, 2020
      Master

      viết thành block if else cho dễ nhìn

      viết thành block if else cho dễ nhìn
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 3 of the diff

      Jan 17, 2020

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/13/diffs?diff_id=4676&start_sha=0da1139050b0729fd6c808ef2b273f6bbb240be9#ca1dced2048c1aa2fb1f535b6ec69018f9a4ba2a_52_52)
      Toggle commit list
    Please register or sign in to reply
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Jan 17, 2020
    Last updated by Đường Sỹ Hoàng Jan 17, 2020
    config/routes.rb
    35 35 get "apply/:job_id", to: "apply#new", as: "apply"
    36 36 post "confirm/:job_id", to: "apply#confirm", as: "confirm"
    37 37 post "done/:job_id", to: "apply#done", as: "done"
    38 get "applied", to: "apply#index", as: "applied"
    • Son Do Hong @sondh commented Jan 17, 2020
      Master

      sử dụng resources

      sử dụng resources
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 3 of the diff

      Jan 17, 2020

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/13/diffs?diff_id=4676&start_sha=0da1139050b0729fd6c808ef2b273f6bbb240be9#e801163eb9182955dca3eb9817d59af634f6665d_38_38)
      Toggle commit list
    Please register or sign in to reply
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • a810b7ef - Change block if else

    Compare with previous version

    Jan 17, 2020

    added 1 commit

    • a810b7ef - Change block if else

    Compare with previous version

    added 1 commit * a810b7ef - Change block if else [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/13/diffs?diff_id=4676&start_sha=0da1139050b0729fd6c808ef2b273f6bbb240be9)
    Toggle commit list
  • Son Do Hong
    @sondh started a discussion on an old version of the diff Jan 17, 2020
    Last updated by Đường Sỹ Hoàng Jan 17, 2020
    app/controllers/apply_controller.rb
    1 1 class ApplyController < ApplicationController
    2 2 before_action :check_user_logged_in?
    3 before_action :load_job, only: [:new, :done, :confirm]
    3 before_action :load_job, only: [:new, :done, :confirm, :index]
    • Son Do Hong @sondh commented Jan 17, 2020
      Master

      hàm index mình có dùng đến @job không, kiểm tra xem có cần load job hay k

      hàm index mình có dùng đến `@job` không, kiểm tra xem có cần load job hay k
    • Đường Sỹ Hoàng @hoangds commented Jan 17, 2020
      Master

      Khi xem server log thì có thế thấy lúc chạy hàm index thì cần tới load job nhưng ko cần @jobnên chỗ này có thể bỏ :index đi để giàm thời gian render trang view của jog apply.

      Khi xem server log thì có thế thấy lúc chạy hàm index thì cần tới load job nhưng ko cần `@job`nên chỗ này có thể bỏ `:index` đi để giàm thời gian render trang view của jog apply.
    • Đường Sỹ Hoàng @hoangds

      changed this line in version 4 of the diff

      Jan 17, 2020

      changed this line in version 4 of the diff

      changed this line in [version 4 of the diff](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/13/diffs?diff_id=4677&start_sha=a810b7efd11e2ef8cc62e4f87cd303459da53943#721dd03d0708cd0f006aac7eaa46f9d651bc1ebe_3_3)
      Toggle commit list
    Please register or sign in to reply
  • Đường Sỹ Hoàng @hoangds

    added 1 commit

    • 5511661a - Remove before_action_index

    Compare with previous version

    Jan 17, 2020

    added 1 commit

    • 5511661a - Remove before_action_index

    Compare with previous version

    added 1 commit * 5511661a - Remove before_action_index [Compare with previous version](https://gitlab.zigexn.vn/hoangds/VenJob/merge_requests/13/diffs?diff_id=4677&start_sha=a810b7efd11e2ef8cc62e4f87cd303459da53943)
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Son Do Hong
Assignee
Son Do Hong @sondh
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: hoangds/VenJob!13