jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject

This commit is contained in:
daiao 2016-11-09 10:02:12 +08:00
parent c1cf633d2c a8575c3476
commit f45e9f992c
6 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/repositories_controller.rb
View File

@ -265,6 +265,7 @@ update
end end
@repository.project = @project @repository.project = @project
@repository.type = 'Repository::Gitlab' @repository.type = 'Repository::Gitlab'
@repository.identifier = @repository.identifier.downcase
@repository.url = @repository.identifier @repository.url = @repository.identifier
if request.post? && @repository.save if request.post? && @repository.save
s = Trustie::Gitlab::Sync.new s = Trustie::Gitlab::Sync.new

2
app/views/projects/forked_pop.js.erb
View File

@ -1,3 +1,3 @@
var htmlvalue = "<%= escape_javascript(render :partial => 'repositories/forked_popbox') %>"; var htmlvalue = "<%= escape_javascript(render :partial => 'repositories/forked_popbox') %>";
pop_box_new(htmlvalue,820,316); pop_box_new(htmlvalue,320,316);

1
app/views/repositories/_forked_popbox.html.erb Normal file
View File

@ -0,0 +1 @@
666

30
app/views/repositories/_link_to_functions.html.erb
View File

@ -1,15 +1,25 @@
<% if @entry && @entry.kind == 'file' %> <% if @entry && @entry.kind == 'file' %>
<%= link_to_if action_name != 'changes', l(:label_history), {:action => 'changes', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }, :class =>"fr mr5"%> <% if action_name != 'entry' %>
<%# if @repository.supports_cat? %> <%= link_to l(:label_history), {:action => 'changes', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }, :class =>"fr mr5"%>
<%#= link_to_if action_name != 'entry', l(:button_view), {:action => 'entry', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }, :class =>"fr" %> <% else %>
<%# end %> <a class="fr mr5"><%= l(:label_history) %></a>
<% end %>
<% if @repository.supports_cat? %>
<% if action_name != 'entry' %>
<%= link_to l(:button_view), {:action => 'entry', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev }, :class =>"fr mr5" %>
<% else %>
<a class="fr mr5"><%= l(:button_view) %></a>
<% end %>
<% end %>
<%# if @repository.supports_annotate? %> <%# if @repository.supports_annotate? %>
<%#= link_to_if action_name != 'annotate', l(:button_annotate), {:action => 'annotate', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev } %> <%#= link_to_if action_name != 'annotate', l(:button_annotate), {:action => 'annotate', :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(@path), :rev => @rev } %>
<%# end %> <%# end %>
<%= link_to(l(:button_download), <%= link_to(l(:button_download),
{:action => 'raw', :id => @project, {:action => 'raw', :id => @project,
:repository_id => @repository.identifier_param, :repository_id => @repository.identifier_param,
:path => to_path_param(@path), :path => to_path_param(@path),
:rev => @rev}, :class => "fr mr5") if @repository.supports_cat? %> :rev => @rev}, :class => "fr mr5") if @repository.supports_cat? %>
<%= "(#{number_to_human_size(@entry.size)})" if @entry.size %> <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
<% end %> <% end %>

2
app/views/repositories/changes.html.erb
View File

@ -9,7 +9,7 @@
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<%#= render :partial => 'link_to_functions' %> <%= render :partial => 'link_to_functions' %>
<%= render_properties(@properties) %> <%= render_properties(@properties) %>

7
app/views/repositories/forked_popbox.html.erb
View File

@ -1,7 +0,0 @@
<div id="muban_popup_box" style="width:820px;">
<div class="muban_popup_top">
<h3 class="fl">新建里程碑</h3>
<a href="javascript:void(0);" class="muban_icons_close fr" onclick="hideModal()"></a>
<div class="cl"></div>
</div>
</div>