diff --git a/app/controllers/panel/personal_project/back_end/projects_controller.rb b/app/controllers/panel/personal_project/back_end/projects_controller.rb index d5ae12e..3666126 100644 --- a/app/controllers/panel/personal_project/back_end/projects_controller.rb +++ b/app/controllers/panel/personal_project/back_end/projects_controller.rb @@ -174,8 +174,14 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll respond_to do |format| if @project.update_attributes(params[:project]) - format.html { redirect_to(panel_personal_project_back_end_projects_url) } - # format.js { render 'toggle_enable' } + + if params[:project][:user_id] + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:project][:user_id],:show_plugin_profile=>"Project")) } + else + format.html { redirect_to(panel_personal_project_back_end_projects_url) } + end + + # format.js { render 'toggle_enable' } format.xml { head :ok } else format.html { render :action => "edit" } @@ -193,7 +199,13 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll @project.destroy respond_to do |format| - format.html { redirect_to(panel_personal_project_back_end_projects_url) } + + if params[:user_id] + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"Project")) } + else + format.html { redirect_to(panel_personal_project_back_end_projects_url) } + end + # format.xml { head :ok } format.js end diff --git a/app/views/panel/personal_project/front_end/projects/show.html.erb b/app/views/panel/personal_project/front_end/projects/show.html.erb index a206742..ba20d3b 100644 --- a/app/views/panel/personal_project/front_end/projects/show.html.erb +++ b/app/views/panel/personal_project/front_end/projects/show.html.erb @@ -1,5 +1,6 @@ <% # encoding: utf-8 %> +
@@ -36,18 +37,18 @@ <% end %> <% if !@project.period_start_date.blank? %> - + <% end %> <% if !@project.period_end_date.blank? %> - + <% end %> <% if !@project.url.blank? %> <% end %> - + <% if @project.project_files.size > 0 %> @@ -65,3 +66,4 @@ <% end %>
<%= t("module_name.personal_project") %>
<%= t("personal_project.start_date")%><%= @project.period_start_date %>
<%= t("personal_project.start_date")%><%= @project.period_start_date.strftime("%Y.%m") %>
<%= t("personal_project.end_date")%><%= @project.period_end_date %>
<%= t("personal_project.end_date")%><%= @project.period_end_date.strftime("%Y.%m") %>
<%= t("personal_project.url")%><%= link_to t(:url), @project.url, {:target => '_blank', :title => @project.url} if !@project.url.blank? %>
<%= t("personal_project.authors")%><%= "#{User.from_id(@project.create_user_id).name rescue ''},#{@project.authors rescue ''}"%>
<%= t("personal_project.authors")%><%= "#{User.from_id(@project.create_user_id).name rescue ''}"%>
<%= t("personal_project.file")%>
+
diff --git a/app/views/panel/personal_project/plugin/_profile.html.erb b/app/views/panel/personal_project/plugin/_profile.html.erb index f459446..8ee3725 100644 --- a/app/views/panel/personal_project/plugin/_profile.html.erb +++ b/app/views/panel/personal_project/plugin/_profile.html.erb @@ -41,7 +41,7 @@ <% end -%> - +
<% if is_admin? %> @@ -55,7 +55,7 @@ <% @projects.each do |project| %> - "> + "> <% if is_admin? %>
<%= check_box_tag 'to_change[]', project.id.to_s, false, :class => "list-check" %> @@ -64,6 +64,14 @@ <%= project.period_start_date.strftime("%Y.%m") %> ~ <%= project.period_end_date.strftime("%Y.%m") %> <%= link_to project.project_title, panel_personal_project_front_end_project_path(project) %> +
+ +