educode_sales 0.9.56 → 0.9.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d43d1ba82cba7ea2e8d642794ff31eea996e7c404c814a9bd7c0b2f01ce089b2
-  data.tar.gz: 4260ff16cbd4be8cd7346d33d3ef621d8f39890f909843a8bc242a80d7670df6
+  metadata.gz: 818fb31794a0b8bd388742d852aacf2e35c054515c7cf7cfd1147c988113f2f9
+  data.tar.gz: db3afee84373a8f61e36b12ed6ab3b3d926ff1f6220b3b650d0fa53921386221
 SHA512:
-  metadata.gz: b1608e8de32122e8d73a535740d92655b08c1961657d2a638690e45647a528bbf82b9631e45982024223a7ddf60c35d263c2c2e942c1b7937890cc247b7b845b
-  data.tar.gz: 26d67e6a7bb5b1a0b0e32bbbdabdc5df567012575c5518c674b7c23bb31beb13c601244e86a5269f7e85c64db123bf014fce2f80d0b6ae7b73403446ebfa1b64
+  metadata.gz: f981b156b309f02188799237054323f548149d4f8154542be0cc1153aaca4c671d19ee4322d487d1bd0abd4cb22236df3bbda48d781dd22c16c9355c3c14766a
+  data.tar.gz: f2867f60c9c7ece3a251ca9b13ae063c3cada9364a9789d4b23872d8cf0983c643b411b1fa11a8f8f585a8c5555bd7d353d7f1b6ed78cdea8e022c8fc0e73da5

data/app/controllers/educode_sales/roles_controller.rb

@@ -16,7 +16,7 @@ module EducodeSales
 
     def create
       role = Role.new(name: params[:name])
-      role.role_areas.build([{ clazz: 'Business' }, { clazz: 'SalePlan' }, { clazz: 'Teacher' }, { clazz: 'Operation' }, { clazz: 'Customer' }, { clazz: 'MoneyPlan' }, { clazz: 'AssessmentsSetting' }])
+      role.role_areas.build([{ clazz: 'Business' }, { clazz: 'SalePlan' }, { clazz: 'Teacher' }, { clazz: 'Operation' }, { clazz: 'Customer' }, { clazz: 'MoneyPlan' }, { clazz: 'AssessmentsSetting' }, { clazz: 'Idea' }])
       if role.save
         render_success
       else
@@ -87,6 +87,9 @@ module EducodeSales
       r = role.role_areas.find_or_initialize_by(clazz: 'AssessmentsSetting')
       r.level = params[:assessments_setting]
       r.save
+      r = role.role_areas.find_or_initialize_by(clazz: 'Idea')
+      r.level = params[:idea]
+      r.save
       render_success
     end
 

data/app/models/educode_sales/permission.rb

@@ -13,7 +13,8 @@ module EducodeSales
       '运营计划': 'operation_plan',
       '客户管理': 'customer',
       '回款管理': 'money_plan',
-      '绩效考核': 'assessments_setting'
+      '绩效考核': 'assessments_setting',
+      '方案管理': 'idea'
     }
   end
 end

data/app/views/educode_sales/idea_recycles/detail.html.erb

@@ -1,6 +1,8 @@
 <div style=" text-align:left; margin-left: 100px;margin-top: 20px">
   <div class="layui-btn-group">
-    <button type="button" class="layui-btn" onclick="pre_follow()">历史记录</button>
+    <% if can? :read_history, EducodeSales::Idea %>
+      <button type="button" class="layui-btn" onclick="pre_follow()">历史记录</button>
+    <% end %>
   </div>
 </div>
 <% EducodeSales::Idea.where(school_id: @idea.school_id).order("id = #{@idea.id} DESC").each do |idea| %>

data/app/views/educode_sales/idea_recycles/index.html.erb

@@ -82,7 +82,9 @@
 </div>
 <script type="text/html" id="currentTableBar">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edita" lay-event="add_event">详情</a>
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_recycle">恢复</a>
+  <% if can? :recycle, EducodeSales::Idea %>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_recycle">恢复</a>
+  <% end %>
 </script>
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {

data/app/views/educode_sales/ideas/detail.html.erb

@@ -1,6 +1,8 @@
 <div style=" text-align:left; margin-left: 100px;margin-top: 20px">
   <div class="layui-btn-group">
-    <button type="button" class="layui-btn" onclick="pre_follow()">历史记录</button>
+    <% if can? :read_history, EducodeSales::Idea %>
+      <button type="button" class="layui-btn" onclick="pre_follow()">历史记录</button>
+    <% end %>
   </div>
 </div>
 <% EducodeSales::Idea.where(school_id: @idea.school_id).order("id = #{@idea.id} DESC").each do |idea| %>

data/app/views/educode_sales/ideas/index.html.erb

@@ -75,7 +75,9 @@
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">方案管理</span>
-    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">新增项目方案</button>
+    <% if can? :create, EducodeSales::Idea %>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">新增项目方案</button>
+    <% end %>
   </div>
 </script>
 <div class="">
@@ -83,8 +85,12 @@
 </div>
 <script type="text/html" id="currentTableBar">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edita" lay-event="add_event">详情</a>
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_edit">编辑</a>
-  <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="idea_recycle">移除</a>
+  <% if can? :update, EducodeSales::Idea %>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_edit">编辑</a>
+  <% end %>
+  <% if can? :destroy, EducodeSales::Idea %>
+    <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="idea_recycle">移除</a>
+  <% end %>
 </script>
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {

data/app/views/layouts/educode_sales/application.html.erb

@@ -125,6 +125,8 @@
                   <i style="font-size: 25px;  padding-right: 15px"></i>绩效考核</a></dd>
             </dl>
           </li>
+        <% end %>
+        <% if can?(:read, EducodeSales::Idea) %>
           <li class="layui-nav-item layui-nav-itemed menu-li">
             <a class="" href="javascript:;"><b><%= image_tag "educode_sales/11.活动运营.png", size: "15" %>
               <i style="font-size: 25px;  padding-right: 25px"></i>方案支撑</b></a>
@@ -138,6 +140,7 @@
             </dl>
           </li>
         <% end %>
+
         <% if @current_admin.is_admin || @current_admin.code == 'userbe' %>
           <li class="layui-nav-item layui-nav-itemed menu-li">
             <a class="" href="javascript:;"><b><%= image_tag "educode_sales/13.系统设置.png", size: "15" %>

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -109,6 +109,13 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
       EducodeSales::Permission.create(name: '添加活动', subject: 'Activity', action: 'create', clazz: 'activity')
       EducodeSales::Permission.create(name: '编辑活动', subject: 'Activity', action: 'update', clazz: 'activity')
       EducodeSales::Permission.create(name: '删除活动', subject: 'Activity', action: 'destroy', clazz: 'activity')
+
+      # EducodeSales::Permission.create(name: '查看方案', subject: 'Idea', action: 'read', clazz: 'idea')
+      # EducodeSales::Permission.create(name: '添加方案', subject: 'Idea', action: 'create', clazz: 'idea')
+      # EducodeSales::Permission.create(name: '编辑方案', subject: 'Idea', action: 'update', clazz: 'idea')
+      # EducodeSales::Permission.create(name: '移除方案', subject: 'Idea', action: 'destroy', clazz: 'idea')
+      # EducodeSales::Permission.create(name: '恢复方案', subject: 'Idea', action: 'recycle', clazz: 'idea')
+      # EducodeSales::Permission.create(name: '查看历史记录', subject: 'Idea', action: 'read_history', clazz: 'idea')
     end
   end
 end

data/db/migrate/20230308022633_add_permissions_to_educode_sales_permissions.rb

@@ -0,0 +1,11 @@
+class AddPermissionsToEducodeSalesPermissions < ActiveRecord::Migration[5.2]
+  def change
+    last_position = EducodeSales::Permission.all.order(position: :asc).last.position
+    EducodeSales::Permission.create(name: '查看方案', subject: 'Idea', action: 'read', clazz: 'idea', position: last_position + 1)
+    EducodeSales::Permission.create(name: '添加方案', subject: 'Idea', action: 'create', clazz: 'idea', position: last_position + 2)
+    EducodeSales::Permission.create(name: '编辑方案', subject: 'Idea', action: 'update', clazz: 'idea', position: last_position + 3)
+    EducodeSales::Permission.create(name: '移除方案', subject: 'Idea', action: 'destroy', clazz: 'idea', position: last_position + 4)
+    EducodeSales::Permission.create(name: '恢复方案', subject: 'Idea', action: 'recycle', clazz: 'idea', position: last_position + 5)
+    EducodeSales::Permission.create(name: '查看历史记录', subject: 'Idea', action: 'read_history', clazz: 'idea', position: last_position + 6)
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.56'
+  VERSION = '0.9.57'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.56
+  version: 0.9.57
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
+- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -555,6 +556,7 @@ files:
 - db/migrate/20230227061043_create_educode_sales_ideas.rb
 - db/migrate/20230228063555_create_educode_sales_idea_histories.rb
 - db/migrate/20230306131055_add_score_to_assessments_settings.rb
+- db/migrate/20230308022633_add_permissions_to_educode_sales_permissions.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -563,7 +565,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -578,8 +580,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []