From 5c2ac3e02fed0990f49b611275da5bfd56099c10 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Mon, 27 Jun 2016 15:47:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E8=B7=A8=E5=9F=9F=E7=9A=84?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_member_controller.rb | 4 ++++ app/views/org_member/deleteOrgMember.js.erb | 3 +++ app/views/organizations/_org_member_list.html.erb | 6 ++++-- config/routes.rb | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 app/views/org_member/deleteOrgMember.js.erb diff --git a/app/controllers/org_member_controller.rb b/app/controllers/org_member_controller.rb index 642a100c3..2eaa790cd 100644 --- a/app/controllers/org_member_controller.rb +++ b/app/controllers/org_member_controller.rb @@ -54,4 +54,8 @@ class OrgMemberController < ApplicationController def index end + + def deleteOrgMember + destroy + end end diff --git a/app/views/org_member/deleteOrgMember.js.erb b/app/views/org_member/deleteOrgMember.js.erb new file mode 100644 index 000000000..d87e62c17 --- /dev/null +++ b/app/views/org_member/deleteOrgMember.js.erb @@ -0,0 +1,3 @@ +$("#org_members_count_id").html(""); +$("#org_members_count_id").html("<%= @org.org_members.count %>") +$("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>'); \ No newline at end of file diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb index 8e8a23b60..8af7986fc 100644 --- a/app/views/organizations/_org_member_list.html.erb +++ b/app/views/organizations/_org_member_list.html.erb @@ -1,6 +1,7 @@ <% members.each do |member|%>
diff --git a/config/routes.rb b/config/routes.rb index ec8fa2337..189c2671d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -116,6 +116,7 @@ RedmineApp::Application.routes.draw do end collection do get 'org_member_autocomplete' + get 'deleteOrgMember' end end From dd397a060b67f292841e58fce8dbfc1d3f26d795 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Mon, 27 Jun 2016 15:48:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E8=B7=A8=E5=9F=9F=E7=9A=84?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/application.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/public/javascripts/application.js b/public/javascripts/application.js index a2f14332d..f5edb5ef4 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1504,4 +1504,18 @@ function edit_file_description(url,id){ } ); } +//删除组织成员 +function ifDeleteOrgMember(id,name){ + var htmlvalue = "
您确定要删除"+name+"吗?

确定取消
" + + ""; + pop_up_box(htmlvalue,580,30,50); +} From a83400f23337bd8daedfe8c98224715299a5b3b7 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Mon, 27 Jun 2016 15:57:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=B2=98=E8=B4=B4=E5=9B=BE=E7=89=87=20?= =?UTF-8?q?=E7=95=99=E8=A8=80=E5=92=8C=E5=9B=9E=E5=A4=8D=E6=A1=86=20?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E7=9B=B4=E6=88=AA=E5=9B=BE=E9=83=BD?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=B2=98=E8=B4=B4=E8=BF=9B=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/pasteimg.js | 42 ++++++++++++++-------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js index 479b1101a..9f848b8e2 100644 --- a/public/assets/kindeditor/pasteimg.js +++ b/public/assets/kindeditor/pasteimg.js @@ -328,27 +328,27 @@ function enablePasteImg(_editor) { $(nodeBody).on('pasteImage', function(ev, data) { //粘贴图片时走这里会出现两张图片走df()即可 -// console.log('pasteImage'); -// console.log("dataURL: " + data.dataURL); -// console.log("width: " + data.width); -// console.log("height: " + data.height); -// var blob = dataURItoBlob(data.dataURL); -// if (data.blob !== null) { -// var data = new FormData(); -// data.append("imgFile",blob, "imageFilename.png"); -// console.log(data); -// $.ajax({ -// url: '/kindeditor/upload?dir=image', -// contentType: false, -// type: 'POST', -// data: data, -// processData: false, -// success: function(data) { -// console.log(data); -// editor.exec('insertimage', JSON.parse(data).url); -// } -// }); -// } + console.log('pasteImage'); + console.log("dataURL: " + data.dataURL); + console.log("width: " + data.width); + console.log("height: " + data.height); + var blob = dataURItoBlob(data.dataURL); + if (data.blob !== null) { + var data = new FormData(); + data.append("imgFile",blob, "imageFilename.png"); + console.log(data); + $.ajax({ + url: '/kindeditor/upload?dir=image', + contentType: false, + type: 'POST', + data: data, + processData: false, + success: function(data) { + console.log(data); + editor.exec('insertimage', JSON.parse(data).url); + } + }); + } }); return; };