Merge pull request #1757 from opf/feature/7846_wiki_macros_are_removed_by_angular

[Feature] Wiki macros are removed by AngularJS
pull/1744/merge
Alex Coles 10 years ago
commit 12a93283e2
  1. 1
      app/helpers/journals_helper.rb
  2. 8
      app/views/messages/_form.html.erb
  3. 4
      app/views/messages/show.html.erb
  4. 7
      app/views/news/_form.html.erb
  5. 2
      app/views/news/show.html.erb
  6. 3
      app/views/project_associations/_form.html.erb
  7. 2
      app/views/project_associations/index.html.erb
  8. 7
      app/views/projects/form/attributes/_description.html.erb
  9. 7
      app/views/projects/form/attributes/_summary.html.erb
  10. 2
      app/views/projects/show.html.erb
  11. 3
      app/views/reportings/edit.html.erb
  12. 2
      app/views/reportings/index.html.erb
  13. 6
      app/views/settings/_general.html.erb
  14. 9
      app/views/wiki/edit.html.erb
  15. 3
      app/views/wiki/new.html.erb
  16. 2
      app/views/work_packages/show.html.erb

@ -112,6 +112,7 @@ module JournalsHelper
content << content_tag('div',
format_text(journal, :notes, :attachments => attachments),
:class => 'wikicontent',
:'ng-non-bindable' => '',
"data-user" => journal.journable.author)
css_classes = "wiki journal-notes"

@ -51,9 +51,11 @@ See doc/COPYRIGHT.rdoc for more details.
<% end %>
<p>
<%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %>
<%= f.text_area :content, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'message_content',
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json) %></p>
<%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %>
<%= f.text_area :content, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'message_content',
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json),
:'ng-non-bindable' => '' %>
</p>
<%= wikitoolbar_for 'message_content' %>
<!--[eoform:message]-->

@ -57,7 +57,7 @@ See doc/COPYRIGHT.rdoc for more details.
<div class="message">
<p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p>
<div class="wiki">
<div class="wiki" ng-non-bindable>
<%= format_text(@topic.content, :object => @topic, :attachments => @topic.attachments) %>
</div>
<%= link_to_attachments @topic, :author => false %>
@ -97,7 +97,7 @@ See doc/COPYRIGHT.rdoc for more details.
:class => 'no-decoration-on-hover',
:alt => l(:button_delete)) if message.destroyable_by?(User.current) %>
</div>
<div class="wiki">
<div class="wiki" ng-non-bindable>
<%= format_text message, :content, :attachments => message.attachments %>
</div>
<%= link_to_attachments message, :author => false %>

@ -31,8 +31,11 @@ See doc/COPYRIGHT.rdoc for more details.
<div class="box tabular">
<p><%= f.text_field :title, :required => true, :size => 60 %></p>
<p><%= f.text_area :summary, :cols => 60, :rows => 2 %></p>
<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 15, :class => 'wiki-edit',
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json) %></p>
<p>
<%= f.text_area :description, :required => true, :cols => 60, :rows => 15, :class => 'wiki-edit',
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json),
:'ng-non-bindable' => '' %>
</p>
</div>
<%= wikitoolbar_for 'news_description' %>

@ -60,7 +60,7 @@ See doc/COPYRIGHT.rdoc for more details.
<p><% unless @news.summary.blank? %><em><%=h @news.summary %></em><br /><% end %>
<span class="author"><%= authoring @news.created_on, @news.author %></span></p>
<div class="wiki">
<div class="wiki" ng-non-bindable>
<%= format_text(@news.description, :object => @news) %>
</div>
<br />

@ -32,5 +32,6 @@ See doc/COPYRIGHT.rdoc for more details.
</label>
<%= f.text_area(:description, :class => 'timelines-project-association-description wiki-edit', :rows => 10,
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json)) %>
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json),
:'ng-non-bindable' => '') %>
<%= wikitoolbar_for 'project_association_description' %>

@ -95,7 +95,7 @@ See doc/COPYRIGHT.rdoc for more details.
-
<% end %>
</td>
<td class="timelines-pa-description">
<td class="timelines-pa-description" ng-non-bindable>
<%= format_text association, :description %>
</td>
<td class="timelines-pa-actions">

@ -27,6 +27,9 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<p><%= form.text_area :description, :rows => 5, :class => 'wiki-edit',
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json) %></p>
<p>
<%= form.text_area :description, :rows => 5, :class => 'wiki-edit',
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json),
:'ng-non-bindable' => '' %>
</p>
<%= wikitoolbar_for 'project_description' %>

@ -27,5 +27,8 @@ See doc/COPYRIGHT.rdoc for more details.
++#%>
<p><%= form.text_area :summary, :rows => 2, :class => 'wiki-edit',
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json) %></p>
<p>
<%= form.text_area :summary, :rows => 2, :class => 'wiki-edit',
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json),
:'ng-non-bindable' => '' %>
</p>

@ -38,7 +38,7 @@ See doc/COPYRIGHT.rdoc for more details.
<% breadcrumb_paths(l(:label_overview)) %>
<div class="splitcontentleft">
<div class="wiki">
<div class="wiki" ng-non-bindable>
<%= format_text @project.description %>
</div>
<ul>

@ -68,7 +68,8 @@ See doc/COPYRIGHT.rdoc for more details.
<%= Reporting.human_attribute_name(:reported_project_status_comment) %>:
</label><br/>
<%= f.text_area(:reported_project_status_comment, :class => 'wiki-edit', :rows => 10,
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json)) %>
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json),
:'ng-non-bindable' => '') %>
<%= wikitoolbar_for 'reporting_reported_project_status_comment' %>
</p>
</fieldset>

@ -65,7 +65,7 @@ See doc/COPYRIGHT.rdoc for more details.
<td class="timelines-rep-short">
<%=h reporting.reported_project_status.try(:name) || "-" %>
</td>
<td class="timelines-rep-comment">
<td class="timelines-rep-comment" ng-non-bindable>
<%= format_text reporting, :reported_project_status_comment %>
</td>
<td class="timelines-rep-last_change">

@ -32,8 +32,10 @@ See doc/COPYRIGHT.rdoc for more details.
<div class="box tabular settings">
<p><%= setting_text_field :app_title, :size => 30 %></p>
<p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
<%= wikitoolbar_for 'settings_welcome_text' %>
<p>
<%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit', :'ng-non-bindable' => '' %>
<%= wikitoolbar_for 'settings_welcome_text' %>
</p>
<p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>

@ -33,9 +33,12 @@ See doc/COPYRIGHT.rdoc for more details.
<%= f.hidden_field :lock_version %>
<%= error_messages_for 'content' %>
<p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit),
:value => format_text(@content, :text, :attachments => @content.page.attachments, :edit => true),
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json) %></p>
<p>
<%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit),
:value => format_text(@content, :text, :attachments => @content.page.attachments, :edit => true),
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json),
:'ng-non-bindable' => '' %>
</p>
<p><label><%= Version.human_attribute_name(:comments) %></label><br /><%= f.text_field :comments, :size => 120 %></p>
<p><label><%=l(:label_attachment_plural)%></label><br /><%= render :partial => 'attachments/form' %></p>
<p><%= submit_tag l(:button_save) %>

@ -53,7 +53,8 @@ See doc/COPYRIGHT.rdoc for more details.
<p>
<%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit),
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json) %>
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json),
:'ng-non-bindable' => '' %>
</p>
<p>

@ -58,7 +58,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= link_to_if_authorized(l(:button_quote), { controller: :work_packages, action: :quoted, id: work_package }, :class => 'quote-link icon icon-quote') %>
</div>
<p><strong><%= WorkPackage.human_attribute_name(:description)%></strong></p>
<div class="wiki wikicontent" data-user="<%= work_package.author %>">
<div class="wiki wikicontent" data-user="<%= work_package.author %>" ng-non-bindable>
<%= format_text work_package, :description, :attachments => work_package.attachments %>
</div>
</div>

Loading…
Cancel
Save