Skip to content
Snippets Groups Projects
Commit 412ff80b authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg Committed by Fatih Acet
Browse files

Start Frontend work, fix routing problem

parent fe043398
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -10,7 +10,7 @@ module ToggleAwardEmoji
 
if awardable.user_can_award?(current_user, name)
awardable.toggle_award_emoji(name, current_user)
todoable = to_todoable(awardable)
TodoService.new.new_award_emoji(todoable, current_user) if todoable
 
Loading
Loading
class Projects::SnippetsController < Projects::ApplicationController
include ToggleAwardEmoji
before_action :module_enabled
before_action :snippet, only: [:show, :edit, :destroy, :update, :raw]
before_action :snippet, only: [:show, :edit, :destroy, :update, :raw, :toggle_award_emoji]
 
# Allow read any snippet
before_action :authorize_read_project_snippet!, except: [:new, :create, :index]
Loading
Loading
@@ -80,6 +82,7 @@ class Projects::SnippetsController < Projects::ApplicationController
def snippet
@snippet ||= @project.snippets.find(params[:id])
end
alias_method :awardable, :snippet
 
def authorize_read_project_snippet!
return render_404 unless can?(current_user, :read_project_snippet, @snippet)
Loading
Loading
module AwardEmojiHelper
def toggle_award_url(awardable)
unless awardable.is_a?(Snippet)
return url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable])
end
if awardable.is_a?(ProjectSnippet)
toggle_award_emoji_namespace_project_snippet_path(@project.namespace.becomes(Namespace), @project, awardable)
else
toggle_award_emoji_snippet_url(awardable)
end
end
end
Loading
Loading
@@ -71,6 +71,12 @@ module Awardable
end
end
 
def user_authored?(current_user)
author = self.respond_to?(:author) ? self.author : self.user
author == current_user
end
def awarded_emoji?(emoji_name, current_user)
award_emoji.where(name: emoji_name, user: current_user).exists?
end
Loading
Loading
Loading
Loading
@@ -196,10 +196,6 @@ module Issuable
end
end
 
def user_authored?(user)
user == author
end
def subscribed_without_subscriptions?(user)
participants(user).include?(user)
end
Loading
Loading
Loading
Loading
@@ -223,10 +223,6 @@ class Note < ActiveRecord::Base
end
end
 
def user_authored?(user)
user == author
end
def award_emoji?
can_be_award_emoji? && contains_emoji_only?
end
Loading
Loading
- grouped_emojis = awardable.grouped_awards(with_thumbs: inline)
.awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.empty?), data: { award_url: url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable]) } }
.awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.empty?), data: { award_url: toggle_award_url(awardable) } }
- awards_sort(grouped_emojis).each do |emoji, awards|
%button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), data: { placement: "bottom", title: award_user_list(awards, current_user) } }
= emoji_icon(emoji, sprite: false)
Loading
Loading
Loading
Loading
@@ -11,4 +11,6 @@
= link_to 'Raw', raw_namespace_project_snippet_path(@project.namespace, @project, @snippet), class: "btn btn-sm", target: "_blank"
= render 'shared/snippets/blob'
 
= render 'award_emoji/awards_block', awardable: @snippet, inline: true
%div#notes= render "projects/notes/notes_with_form"
Loading
Loading
@@ -10,3 +10,5 @@
= clipboard_button(clipboard_target: ".blob-content[data-blob-id='#{@snippet.id}']")
= link_to 'Raw', raw_snippet_path(@snippet), class: "btn btn-sm", target: "_blank"
= render 'shared/snippets/blob'
= render 'award_emoji/awards_block', awardable: @snippet, inline: true
\ No newline at end of file
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment