Просмотр исходного кода

Refactoring: Removed unneeded Network functionality structure.

Thorsten Eckel 7 лет назад
Родитель
Сommit
5d73e699fe

+ 0 - 67
app/assets/javascripts/app/controllers/network.coffee

@@ -1,67 +0,0 @@
-class Index extends App.ControllerContent
-  events:
-    'click [data-type=network-new]':              'network_new'
-    'click [data-type=network-edit]':             'network_edit'
-    'click [data-type=network-destroy]':          'network_destroy'
-    'click [data-type=network-category-new]':     'network_category_new'
-    'click [data-type=network-category-edit]':    'network_category_edit'
-    'click [data-type=network-category-destroy]': 'network_category_destroy'
-
-  constructor: ->
-    super
-
-    # set title
-    @title 'Network'
-    @render()
-    @navupdate '#network'
-
-  render: ->
-    networks = App.Network.all()
-    network_categories = App.NetworkCategory.all()
-    for network in networks
-      @log 'notice', network    for network in networks
-
-    for network_category in network_categories
-      @log 'notice', network_category
-
-    @html App.view('network')(
-      networks: App.Network.all(),
-    )
-
-  network_new: (e) ->
-    e.preventDefault()
-    new App.ControllerGenericNewWindow(
-      pageData: {
-        object: 'Network',
-      },
-      genericObject: App.Network,
-      success: =>
-        @render()
-    )
-
-  network_edit: (e) ->
-    e.preventDefault()
-    @id = $(e.target).parents('[data-id]').data('id')
-    new App.ControllerGenericEditWindow(
-      id: @id,
-      pageData: {
-        object: 'Network',
-      },
-      genericObject: App.Network,
-      success: =>
-        @render()
-    )
-
-  network_destroy: (e) ->
-    e.preventDefault()
-    id = $(e.target).parents('[data-id]').data('id')
-    item = App.Network.find(id)
-    item.destroy() if confirm('Sure?')
-    @render()
-
-App.Config.set( 'network', Index, 'Routes' )
-
-#App.Config.set( 'Network', { prio: 1500, parent: '', name: 'Networking', target: '#network', role: ['Anybody', 'Customer', 'Agent'] }, 'NavBar' ), 'NavBar' )
-#App.Config.set( '', { prio: 1600, parent: '', name: 'anybody+agent', target: '#aa', role: ['Anybody', 'Agent'] }
-#App.Config.set( '', { prio: 1600, parent: '', name: 'Anybody', target: '#anybody', role: ['Anybody'] }
-

+ 0 - 9
app/assets/javascripts/app/models/network.coffee

@@ -1,9 +0,0 @@
-class App.Network extends App.Model
-  @configure 'Network', 'name', 'note', 'active', 'updated_at'
-  @extend Spine.Model.Ajax
-  @configure_attributes = [
-    { name: 'name',       display: 'Name',    tag: 'input', type: 'text', limit: 100, null: false },
-    { name: 'note',       display: 'Note',    note: 'Notes are visible to agents only, never to customers.', tag: 'textarea', limit: 250, null: true },
-    { name: 'updated_at', display: 'Updated', tag: 'datetime', readonly: 1 },
-    { name: 'active',     display: 'Active',  tag: 'active', default: true },
-  ]

+ 0 - 3
app/assets/javascripts/app/models/network_category.coffee

@@ -1,3 +0,0 @@
-class App.NetworkCategory extends App.Model
-  @configure 'NetworkCategory', 'name', 'network_id', 'network_category_type_id', 'network_privacy_id', 'note', 'allow_comments', 'active', 'updated_at'
-  @extend Spine.Model.Ajax

+ 0 - 3
app/assets/javascripts/app/models/network_category_type.coffee

@@ -1,3 +0,0 @@
-class App.NetworkCategoryType extends App.Model
-  @configure 'NetworkCategoryType', 'name', 'note', 'active', 'updated_at'
-  @extend Spine.Model.Ajax

+ 0 - 3
app/assets/javascripts/app/models/network_privacy.coffee

@@ -1,3 +0,0 @@
-class App.NetworkPrivacy extends App.Model
-  @configure 'NetworkPrivacy', 'name', 'key', 'updated_at'
-  @extend Spine.Model.Ajax

+ 0 - 84
app/assets/javascripts/app/views/network.jst.eco

@@ -1,84 +0,0 @@
-<div class="page-header">
-  <div class="page-header-title">
-    <h1>Networking <small></small></h1>
-  </div>
-</div>
-
-<div class="row">
-  <div class="">
-  
-<% for network in @networks: %>
-    <div class="row">
-      <div class="span9">
-        <h2><%= network.name %> <small><%= network.note %></small></h2> <span data-id="<%= network.id %>"><a data-type="network-edit" href="#">edit</a> | <a data-type="network-destroy" href="#">delete</a> | <a data-type="network-category-new" href="#">new category</a></span>
-        <div class="row">
-          <div class="span4">
-            <h4>Announcements</h4>
-            <span data-id="<%= network.id %>"><a data-type="network-category-edit" href="#">edit</a> | <a data-type="network-category-destroy" href="#">delete</a></span>
-            <ul>
-              <li><a href="#">New XXX</a></li>
-              <li><a href="#">New XXX</a></li>
-              <li><a href="#">New XXX</a></li>
-              <li><a href="#">New XXX</a></li>
-            </ul>            
-          </div>
-          <div class="span4">
-            <h4>Questions</h4>
-            <ul>
-              <li><a href="#">New XXX</a></li>
-              <li><a href="#">New XXX</a></li>
-              <li><a href="#">New XXX</a></li>
-              <li><a href="#">New XXX</a></li>
-            </ul>            
-          </div>
-        </div>
-        <div class="row">
-          <div class="span4">
-            <h4>Ideas</h4>
-            <ul>
-              <li><a href="#">New XXX</a></li>
-              <li><a href="#">New XXX</a></li>
-              <li><a href="#">New XXX</a></li>
-              <li><a href="#">New XXX</a></li>
-            </ul>            
-          </div>
-          <div class="span4">
-            <h4>Bugs</h4>
-            <ul>
-              <li><a href="#">New XXX</a></li>
-              <li><a href="#">New XXX</a></li>
-              <li><a href="#">New XXX</a></li>
-              <li><a href="#">New XXX</a></li>
-            </ul>            
-          </div>
-        </div>
-      </div>
-    </div>
-<% end %>
-    
-  </div>
-  <div class="span3">
-
-    <div class="row">
-      <div class="span3">
-        <h2>Actions</h2>
-          <ul>
-            <li><a data-type="network-new" href="">New Network</a></li>
-          </ul>
-        </div>
-    </div>
-
-    <div class="row">
-      <div class="span3">
-        <h2>Activity Stream</h2>
-          <ul>
-            <li>New XXX</li>
-            <li>New XXX</li>
-            <li>New XXX</li>
-            <li>New XXX</li>
-          </ul>
-      </div>
-    </div>
-
-  </div>
-</div>

+ 0 - 87
app/controllers/network_controller.rb

@@ -1,87 +0,0 @@
-# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
-
-class NetworksController < ApplicationController
-  prepend_before_action :authentication_check
-
-  # GET /networks
-  # GET /networks.json
-  def index
-    @networks = Network.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @networks }
-    end
-  end
-
-  # GET /networks/1
-  # GET /networks/1.json
-  def show
-    @network = Network.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @network }
-    end
-  end
-
-  # GET /networks/new
-  # GET /networks/new.json
-  def new
-    @network = Network.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @network }
-    end
-  end
-
-  # GET /networks/1/edit
-  def edit
-    @network = Network.find(params[:id])
-  end
-
-  # POST /networks
-  # POST /networks.json
-  def create
-    @network = Network.new(params[:network])
-
-    respond_to do |format|
-      if @network.save
-        format.html { redirect_to @network, notice: 'Network was successfully created.' }
-        format.json { render json: @network, status: :created }
-      else
-        format.html { render action: 'new' }
-        format.json { render json: @network.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /networks/1
-  # PUT /networks/1.json
-  def update
-    @network = Network.find(params[:id])
-
-    respond_to do |format|
-      if @network.update!(params[:network])
-        format.html { redirect_to @network, notice: 'Network was successfully updated.' }
-        format.json { render json: @network, status: :ok }
-      else
-        format.html { render action: 'edit' }
-        format.json { render json: @network.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /networks/1
-  # DELETE /networks/1.json
-  def destroy
-    @network = Network.find(params[:id])
-    @network.destroy
-
-    respond_to do |format|
-      format.html { redirect_to networks_url }
-      format.json { head :ok }
-    end
-  end
-end

+ 0 - 14
app/controllers/sessions/collection_network.rb

@@ -1,14 +0,0 @@
-# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
-
-module ExtraCollection
-  def session( collections, assets, _user )
-
-    collections[ Network.to_app_model ]                 = Network.all
-    collections[ Network::Category.to_app_model ]       = Network::Category.all
-    collections[ Network::Category::Type.to_app_model ] = Network::Category::Type.all
-    collections[ Network::Privacy.to_app_model ]        = Network::Privacy.all
-    [collections, assets]
-  end
-
-  module_function :session
-end

+ 0 - 33
app/models/network.rb

@@ -1,33 +0,0 @@
-# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
-
-class Network < ApplicationModel
-  #  belongs_to :group
-  #  belongs_to :state,    :class_name => 'Ticket::State'
-  #  belongs_to :priority, :class_name => 'Ticket::Priority'
-
-  class Category < ApplicationModel
-    self.table_name = 'network_categories'
-
-    class Type < ApplicationModel
-    end
-
-    class Subscription < ApplicationModel
-    end
-  end
-
-  class Item < ApplicationModel
-    class Comment < ApplicationModel
-    end
-
-    class Plus < ApplicationModel
-      self.table_name = 'network_item_plus'
-    end
-
-    class Subscription < ApplicationModel
-    end
-  end
-
-  class Privacy < ApplicationModel
-    self.table_name = 'network_privacies'
-  end
-end

+ 0 - 11
config/routes/network.rb

@@ -1,11 +0,0 @@
-Zammad::Application.routes.draw do
-  api_path = Rails.configuration.api_path
-
-  # networkss
-  match api_path + '/networks',           to: 'networks#index',  via: :get
-  match api_path + '/networks/:id',       to: 'networks#show',   via: :get
-  match api_path + '/networks',           to: 'networks#create', via: :post
-  match api_path + '/networks/:id',       to: 'networks#update', via: :put
-  match api_path + '/networks/:id',       to: 'networks#destroy', via: :delete
-
-end

Некоторые файлы не были показаны из-за большого количества измененных файлов