Permalink
Browse files

been working on the model so that when 'replacements' are removed (or…

… at least the div's) that they should be removed for real from the database.

Except the deleting itself, the editing of all fields at the same time, works.
  • Loading branch information...
1 parent 19024e7 commit 9d079a71912178cbef24f2351003410ae2844b95 @andycapiaugb committed Mar 31, 2011
View
@@ -27,88 +27,70 @@
<file leaf-file-name="contracts_controller.rb" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/controllers/contracts_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="0" selection-start="160" selection-end="160" vertical-scroll-proportion="0.0">
+ <state line="0" column="6" selection-start="6" selection-end="6" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="_fields.html.erb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/views/employees/_fields.html.erb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="2" column="114" selection-start="159" selection-end="159" vertical-scroll-proportion="-1.25">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="function.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/models/function.rb">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="employee.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/models/employee.rb">
+ <file leaf-file-name="edit.html.erb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/views/contracts/edit.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="66" selection-start="446" selection-end="446" vertical-scroll-proportion="0.0">
+ <state line="2" column="19" selection-start="75" selection-end="75" vertical-scroll-proportion="-1.25">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="contract.rb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/models/contract.rb">
+ <file leaf-file-name="new.html.erb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/views/contracts/new.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="20" selection-start="365" selection-end="372" vertical-scroll-proportion="0.0">
+ <state line="2" column="19" selection-start="74" selection-end="74" vertical-scroll-proportion="-1.25">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="application.html.erb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/views/layouts/application.html.erb">
+ <file leaf-file-name="_fields.html.erb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/views/contracts/_fields.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="20" column="0" selection-start="705" selection-end="705" vertical-scroll-proportion="-12.5">
+ <state line="5" column="19" selection-start="170" selection-end="170" vertical-scroll-proportion="-3.125">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="edit.html.erb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/views/people/edit.html.erb">
+ <file leaf-file-name="contracts_helper.rb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/helpers/contracts_helper.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0">
+ <state line="3" column="71" selection-start="163" selection-end="163" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="new.html.erb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/views/contracts/new.html.erb">
+ <file leaf-file-name="_replacing.html.erb" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/app/views/contracts/_replacing.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="2" column="19" selection-start="74" selection-end="74" vertical-scroll-proportion="-1.25">
+ <state line="8" column="61" selection-start="546" selection-end="563" vertical-scroll-proportion="-5.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="_fields.html.erb" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/app/views/contracts/_fields.html.erb">
+ <file leaf-file-name="application.js" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/public/javascripts/application.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="87" selection-start="369" selection-end="369" vertical-scroll-proportion="0.27454242">
+ <state line="5" column="30" selection-start="266" selection-end="266" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="_replacement.html.erb" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/views/contracts/_replacement.html.erb">
+ <file leaf-file-name="contract.rb" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/app/models/contract.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0">
+ <state line="38" column="0" selection-start="1401" selection-end="1401" vertical-scroll-proportion="0.696">
<folding />
</state>
</provider>
@@ -129,22 +111,22 @@
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/app/views/solicitations/_fields.html.erb" />
- <option value="$PROJECT_DIR$/app/views/solicitations/new.html.erb" />
<option value="$PROJECT_DIR$/app/controllers/solicitations_controller.rb" />
<option value="$PROJECT_DIR$/db/migrate/20110314142535_create_contracts.rb" />
- <option value="$PROJECT_DIR$/app/models/contract.rb" />
- <option value="$PROJECT_DIR$/app/helpers/contracts_helper.rb" />
<option value="$PROJECT_DIR$/app/views/contracts/edit.html.erb" />
<option value="$PROJECT_DIR$/app/views/employees/show.html.erb" />
<option value="$PROJECT_DIR$/public/stylesheets/custom.css" />
<option value="$PROJECT_DIR$/app/views/layouts/application.html.erb" />
- <option value="$PROJECT_DIR$/app/views/contracts/_replacement.html.erb" />
<option value="$PROJECT_DIR$/app/controllers/contracts_controller.rb" />
<option value="$PROJECT_DIR$/app/views/employees/_fields.html.erb" />
<option value="$PROJECT_DIR$/app/views/contracts/new.html.erb" />
<option value="$PROJECT_DIR$/app/models/employee.rb" />
+ <option value="$PROJECT_DIR$/app/views/contracts/_replacement.html.erb" />
<option value="$PROJECT_DIR$/app/views/contracts/_fields.html.erb" />
+ <option value="$PROJECT_DIR$/app/helpers/contracts_helper.rb" />
+ <option value="$PROJECT_DIR$/app/views/contracts/_replacing.html.erb" />
+ <option value="$PROJECT_DIR$/public/javascripts/application.js" />
+ <option value="$PROJECT_DIR$/app/models/contract.rb" />
</list>
</option>
</component>
@@ -368,6 +350,7 @@
<property name="options.splitter.main.proportions" value="0.3" />
<property name="options.lastSelected" value="editing.templates" />
<property name="recentsLimit" value="5" />
+ <property name="GoToClass.includeJavaFiles" value="false" />
<property name="options.searchVisible" value="true" />
<property name="options.splitter.details.proportions" value="0.2" />
</component>
@@ -588,7 +571,7 @@
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3283582" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24935897" sideWeight="0.6" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24935897" sideWeight="0.67164177" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32985073" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
@@ -639,114 +622,114 @@
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/app/views/people/edit.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/views/employees/show.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="34" column="57" selection-start="1026" selection-end="1026" vertical-scroll-proportion="0.86734694">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/stylesheets/custom.css">
+ <entry file="file://$PROJECT_DIR$/app/controllers/employees_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="19" column="15" selection-start="189" selection-end="189" vertical-scroll-proportion="0.4">
+ <state line="5" column="6" selection-start="105" selection-end="105" vertical-scroll-proportion="0.12">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/employees/show.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/controllers/people_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="57" selection-start="1026" selection-end="1026" vertical-scroll-proportion="0.86734694">
+ <state line="5" column="0" selection-start="67" selection-end="67" vertical-scroll-proportion="0.12">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/employees_controller.rb">
+ <entry file="file://$PROJECT_DIR$/app/views/layouts/application.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="6" selection-start="105" selection-end="105" vertical-scroll-proportion="0.12">
+ <state line="20" column="0" selection-start="705" selection-end="705" vertical-scroll-proportion="-12.5">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/people_controller.rb">
+ <entry file="file://$PROJECT_DIR$/app/views/contracts/new.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="0" selection-start="67" selection-end="67" vertical-scroll-proportion="0.12">
+ <state line="2" column="19" selection-start="74" selection-end="74" vertical-scroll-proportion="-1.25">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/contracts/edit.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/models/replacement.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="2" column="18" selection-start="74" selection-end="74" vertical-scroll-proportion="0.048465267">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/helpers/contracts_helper.rb">
+ <entry file="file://$PROJECT_DIR$/app/controllers/contracts_controller.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="2" column="25" selection-start="81" selection-end="81" vertical-scroll-proportion="0.048">
+ <state line="0" column="6" selection-start="6" selection-end="6" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/layouts/application.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/helpers/contracts_helper.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="20" column="0" selection-start="705" selection-end="705" vertical-scroll-proportion="-12.5">
+ <state line="3" column="71" selection-start="163" selection-end="163" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/models/contract.rb">
+ <entry file="file://$PROJECT_DIR$/app/models/employee.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="6" column="20" selection-start="365" selection-end="372" vertical-scroll-proportion="0.0">
+ <state line="14" column="66" selection-start="446" selection-end="446" vertical-scroll-proportion="0.336">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/contracts/_replacement.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/models/function.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/models/function.rb">
+ <entry file="file://$PROJECT_DIR$/app/views/employees/_fields.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="2" column="114" selection-start="159" selection-end="159" vertical-scroll-proportion="0.049916804">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/employees/_fields.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/views/contracts/edit.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="2" column="114" selection-start="159" selection-end="159" vertical-scroll-proportion="-1.25">
+ <state line="2" column="19" selection-start="75" selection-end="75" vertical-scroll-proportion="-1.25">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/controllers/contracts_controller.rb">
+ <entry file="file://$PROJECT_DIR$/public/javascripts/application.js">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="0" selection-start="160" selection-end="160" vertical-scroll-proportion="0.0">
+ <state line="5" column="30" selection-start="266" selection-end="266" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/models/employee.rb">
+ <entry file="file://$PROJECT_DIR$/app/views/contracts/_fields.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="66" selection-start="446" selection-end="446" vertical-scroll-proportion="0.0">
+ <state line="5" column="19" selection-start="170" selection-end="170" vertical-scroll-proportion="-3.125">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/contracts/new.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/views/contracts/_replacing.html.erb">
<provider selected="true" editor-type-id="text-editor">
- <state line="2" column="19" selection-start="74" selection-end="74" vertical-scroll-proportion="-1.25">
+ <state line="8" column="61" selection-start="546" selection-end="563" vertical-scroll-proportion="-5.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/app/views/contracts/_fields.html.erb">
+ <entry file="file://$PROJECT_DIR$/app/models/contract.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="87" selection-start="369" selection-end="369" vertical-scroll-proportion="0.27454242">
+ <state line="38" column="0" selection-start="1401" selection-end="1401" vertical-scroll-proportion="0.696">
<folding />
</state>
</provider>
@@ -1,7 +1,7 @@
module ContractsHelper
def add_replacement_link(name)
link_to_function name do |page|
- page.insert_html :bottom, :replacements, :partial => 'replacement', :object => Replacement.new
+ page.insert_html :bottom, :replacements, :partial => 'replacing', :object => Replacement.new
end
end
end
Oops, something went wrong. Retry.

0 comments on commit 9d079a7

Please sign in to comment.