From d083d00bbbe196dfea253b8af9a89a84064ff657 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Thu, 16 Oct 2014 21:50:41 +0200 Subject: [PATCH] rmeove wiki --- app/controllers/wikis_controller.rb | 46 ------------------ app/models/thema.rb | 4 +- app/models/wiki.rb | 73 ----------------------------- app/views/wikis/_form.html.erb | 38 --------------- app/views/wikis/edit.html.erb | 5 -- app/views/wikis/edit.js.erb | 1 - app/views/wikis/show.html.erb | 9 ---- app/views/wikis/verwalten.html.erb | 8 ---- config/routes.rb | 6 --- 9 files changed, 1 insertion(+), 189 deletions(-) delete mode 100644 app/controllers/wikis_controller.rb delete mode 100644 app/models/wiki.rb delete mode 100644 app/views/wikis/_form.html.erb delete mode 100644 app/views/wikis/edit.html.erb delete mode 100644 app/views/wikis/edit.js.erb delete mode 100644 app/views/wikis/show.html.erb delete mode 100644 app/views/wikis/verwalten.html.erb diff --git a/app/controllers/wikis_controller.rb b/app/controllers/wikis_controller.rb deleted file mode 100644 index 46b6b15..0000000 --- a/app/controllers/wikis_controller.rb +++ /dev/null @@ -1,46 +0,0 @@ -class WikisController < ApplicationController - load_and_authorize_resource - - def show - @wiki = Wiki.find(params[:id]) - @fragen = @wiki.fragen - @toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('wiki.edit'), :path=>verwalten_thema_path(@wiki)}] - end - - def wiki - @wiki = Wiki.find_or_init(params[:name]) - @fragen = @wiki.fragen - @toolbar_elements = [] -# @toolbar_elements = [{:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('wiki.edit'), :path=>verwalten_wiki_path(@wiki)}] - - redirect_to wiki_path(@wiki) - end - - - def edit - @wiki = Wiki.find(params[:id]) - respond_to do |format| - format.html - format.js - end - - end - - def update - @wiki = Wiki.find(params[:id]) - @themen = @wiki.themengruppe.themen.order(:priority).reverse - @wiki.raw_data=params[:wiki][:raw_data] - respond_to do |format| - if @wiki.update_attributes(params[:wiki]) - format.html { redirect_to verwalten_thema_path(@wiki), notice: 'Thema was successfully updated.' } - format.json { head :no_content } - format.js - else - format.html { render action: "edit" } - format.json { render json: @wiki.errors, status: :unprocessable_entity } - format.js { render action: "edit" } - end - end - - end -end diff --git a/app/models/thema.rb b/app/models/thema.rb index d61bf46..73f77fe 100644 --- a/app/models/thema.rb +++ b/app/models/thema.rb @@ -33,9 +33,7 @@ include Rails.application.routes.url_helpers false end end - def is_wiki? - !(wikiname.nil? || wikiname.empty?) - end + def text_first_words md = /

(?[^\<\>]*)/.match Sanitize.clean(self.text,:elements=>['p']) words=md[:text].split(" ") unless md.nil? diff --git a/app/models/wiki.rb b/app/models/wiki.rb deleted file mode 100644 index 23cd374..0000000 --- a/app/models/wiki.rb +++ /dev/null @@ -1,73 +0,0 @@ -class Wiki < Thema - validates :wikiname, :uniqueness=>true, :presence=>true - after_initialize :load_wiki - attr_accessible :wikiname, :wikiformat, :hidelink, :raw_data - WIKIFORMATS={nil=> :textile, 0 =>:textile, 1=> :mediawiki} - - def self.find_or_init(name) - w = Wiki.where(:wikiname=>name).first - page = is_file_availaible(name) - if w.nil? - unless page.nil? - w=Wiki.new(:wikiname=>name, :title=>name, :wikiformat=>Wiki::WIKIFORMATS.invert[page.format], :hidelink=>true) - else - w=Wiki.new(:wikiname=>name, :title=>name, :wikiformat=>0, :hidelink=>true) - wiki = Gollum::Wiki.new("../wiki.git", :base_path => "/wiki") - page=wiki.write_page(name, :textile, "ioi", self.commit) - w.reload_page - end - - w.themengruppe = Themengruppe.find_wiki_default - w.raw_data="Neues Wiki" - w.save - end - w - end - - def raw_data - self.page.raw_data - end - - def raw_data=(data) - self.get_page(self.wikiname) - self.wiki.update_page(self.page, self.wikiname, Wiki::WIKIFORMATS[self.wikiformat], data, self.commit) - self.text=self.page.formatted_data - - end - - def page - self.get_page(wikiname) if @page.nil? - @page - end - - def wiki - @wiki - end - def reload_page - self.get_page(self.wikiname) - end - protected - - - def self.is_file_availaible(name) - wiki = Gollum::Wiki.new("../wiki.git", :base_path => "/wiki") - wiki.page(name) - end - - def load_wiki - @wiki = Gollum::Wiki.new("../wiki.git", :base_path => "/wiki") - end - - def get_page(name) - @page= @wiki.page(name) - @page=self.wiki.write_page(self.wikiname, Wiki::WIKIFORMATS[self.wikiformat]," ",self.commit) if @page.nil? - @page - end - def commit - {message: "RailsUpdate", name:"SomeUser", email: "ttt@t"} - end - - def self.commit - {message: "RailsUpdate", name:"SomeUser", email: "ttt@t"} - end -end diff --git a/app/views/wikis/_form.html.erb b/app/views/wikis/_form.html.erb deleted file mode 100644 index b17a9e9..0000000 --- a/app/views/wikis/_form.html.erb +++ /dev/null @@ -1,38 +0,0 @@ -<%= tinymce_assets %> -

- <%= semantic_form_for @wiki, :remote=>remote do |f| %> - <%= f.inputs do %> -
-
- <%= f.input :title %> -
-
- <%= f.input :themengruppe %> -
-
-
-
- <%= f.input :wikiformat, :as=>:select, :collection=>Wiki::WIKIFORMATS.invert %> -
-
- <%= f.input :hidelink, :as=>:boolean %> - - <%= @wiki.wikiname %> -
-
- -
-
- <%= f.input :raw_data, :label=>false,:as=>:text, :input_html=>{:rows=>20,:class=>"row-fluid"} %> -
-
- <%= f.actions do %> - <%= f.action :submit, :as => :button %> - <%= f.action :cancel, :as => :link %> - <% end %> - <% end %><% end %> - <%= tinymce %> -

Attachments:

- - - diff --git a/app/views/wikis/edit.html.erb b/app/views/wikis/edit.html.erb deleted file mode 100644 index 93d58a1..0000000 --- a/app/views/wikis/edit.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -
-

Editing thema

-<%= render 'form', :remote=>false, :locals=>{:remote=>false} %> -
-
<%= link_to 'Back', @thema %> diff --git a/app/views/wikis/edit.js.erb b/app/views/wikis/edit.js.erb deleted file mode 100644 index 0255518..0000000 --- a/app/views/wikis/edit.js.erb +++ /dev/null @@ -1 +0,0 @@ -$("#themaview").html("<%= escape_javascript(raw("

"+I18n.t('wiki.edit')+"

")+render(:partial=>"wikis/form", :locals=>{:remote=>true}) )%>"); diff --git a/app/views/wikis/show.html.erb b/app/views/wikis/show.html.erb deleted file mode 100644 index 9917dee..0000000 --- a/app/views/wikis/show.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -

<%= notice %>

-<%= link_to "Zurück", @wiki.themengruppe %> -
-<%= debug @wiki %> -<%= render :partial=>"themen/small", :object=>@wiki %> - - -<%= render :partial=>'layouts/pretty_toolbar' %> - diff --git a/app/views/wikis/verwalten.html.erb b/app/views/wikis/verwalten.html.erb deleted file mode 100644 index a2e6f28..0000000 --- a/app/views/wikis/verwalten.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -verwalte ein wiki - -<%= @wiki %> - -<%= render :partial=>'layouts/pretty_toolbar' %> - -<%= debug @wiki %> -<%= debug params %> diff --git a/config/routes.rb b/config/routes.rb index 14ce523..ec9e760 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -23,12 +23,6 @@ Fetsite::Application.routes.draw do end devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"} - scope '(:locale)' do - scope '(t/:theme)' do - get "wiki/:name", action: :wiki, controller: :wikis - resources :wikis - end - end scope '(:locale)' do scope '(t/:theme)' do